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

Conflicts:
	services/api/db/schema.rb

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