Merge branch 'stage6' of bitbucket.org:Bonus_05/expomap into stage6

emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html

@@ -396,7 +396,7 @@
                                                               <img src="cid:foreign_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}"/>
                                                         </a>
                                                     </td>
-                                                    <td style="padding-left: 20px; width: 450px;">
+                                                    <td valign="top" style="padding-left: 20px; width: 450px;">
                                                         <table border="0" cellspacing="0" cellpadding="0">
                                                             <tr>
                                                               <td style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px; {% if forloop.first %}color: #33ccff; {% elif forloop.counter == 2 %}color: #cc3399; {% elif forloop.counter == 3 %}color: #99cc66;{% elif forloop.counter == 4 %}color: #ff6600;{% endif %}">