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

app/views/org_document_comments/show.html.erb

@@ -1,8 +1,4 @@
-<%= content_for(:header_tags) do %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor",'blog' %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-<%= javascript_include_tag 'blog' %>
-<% end %>
-
 <script>
     $(function() {
         init_activity_KindEditor_data(<%= @document.id%>,null,"85%");