Merge remote-tracking branch 'origin/master' into origin-2939-re-run-job-button refs...

Conflicts:
	services/api/db/schema.rb

diff --cc apps/workbench/app/controllers/application_controller.rb
Simple merge

diff --cc apps/workbench/app/models/arvados_base.rb
Simple merge

diff --cc services/api/db/schema.rb
index c63a312dcff3d33d8c2acd11a1bc2f56e60ec453,b026dff554e0064820665af8e23b35240465fa44..1ef80ab670389f3a7f87bc9e9581e44cd618a656
--- 1/services/api/db/schema.rb
--- 2/services/api/db/schema.rb
+++ b/services/api/db/schema.rb
@@@ -11,8 -11,9 +11,8 @@@
  #
  # It's strongly recommended to check this file into your version control system.
  
 -ActiveRecord::Schema.define(:version => 20140602143352) do
 -
  
- ActiveRecord::Schema.define(:version => 20140601022548) do
++ActiveRecord::Schema.define(:version => 20140602143352) do
  
    create_table "api_client_authorizations", :force => true do |t|
      t.string   "api_token",                                           :null => false