Merge branch 'master' into feature-mass-ops

Conflicts:
	circle/dashboard/templates/dashboard/_notifications-timeline.html

circle/dashboard/templates/dashboard/_notifications-timeline.html

@@ -3,7 +3,7 @@
 {% for n in notifications %}
   <li class="notification-message" id="msg-{{n.id}}">
     <span class="notification-message-subject">
-      {% if n.status == "new" %}<i class="fa fa-envelope-alt"></i> {% endif %}
+      {% if n.status == "new" %}<i class="fa fa-envelope-o"></i> {% endif %}
       {{ n.subject|get_text:user }}
     </span>
     <span class="notification-message-date pull-right" title="{{n.created}}">