Merge branch 'dev_shcool' into develop

app/views/attachments/_activity_attach.html.erb

@@ -11,7 +11,7 @@
           </span>
           <% user_name = attachment.author.show_name.empty? ? attachment.author : attachment.author.show_name %>
           <span class="author" title="<%= user_name %>">
-            <%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "c_orange" %>,
+            <%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "linkBlue2" %>,
             <%= format_time(attachment.created_on) %>
           </span>
         </div>