Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/projects/_project_activities.html.erb

@@ -48,7 +48,7 @@
 </script>
 
 <% unless forge_acts.empty? %>
-    <% forge_acts.includes(:forge_act).each do |activity| -%>
+    <% forge_acts.each do |activity| -%>
         <script>
             function expand_reply(container, btnid) {
                 var target = $(container);