Merge branch 'develop' of github.com:martini/zammad into develop

app/assets/javascripts/app/controllers/ticket_zoom/article_view.js.coffee

@@ -78,7 +78,6 @@ class ArticleViewItem extends App.Controller
     # check if rerender is needed
     return if !@hasChanged(@article)
 
-    console.log('RERENDER', @ticket_article_id)
     # prepare html body
     if @article.content_type is 'text/html'
       @article['html'] = @article.body

db/migrate/20150616224717_add_base_indexes.rb

@@ -0,0 +1,12 @@
+class AddBaseIndexes < ActiveRecord::Migration
+  def change
+    add_index :users, [:organization_id]
+    add_index :roles_users, [:user_id]
+    add_index :roles_users, [:role_id]
+    add_index :groups_users, [:user_id]
+    add_index :groups_users, [:group_id]
+    add_index :organizations_users, [:user_id]
+    add_index :organizations_users, [:organization_id]
+
+  end
+end