Merge branch 'stable' into develop

Gemfile

@@ -278,6 +278,6 @@ group :development, :test do
   # Jasmine (client side application tests (JS))
   gem "jasmine",                   "2.3.0"
   gem "jasmine-jquery-rails",      "2.0.3"
-  gem "rails-assets-jasmine-ajax", "3.1.0", source: "https://rails-assets.org"
+  gem "rails-assets-jasmine-ajax", "3.1.1", source: "https://rails-assets.org"
   gem "sinon-rails",               "1.10.3"
 end

Gemfile.lock

@@ -498,9 +498,9 @@ GEM
     rails-assets-highlightjs (8.5.0)
     rails-assets-jakobmattsson--jquery-elastic (1.6.11)
       rails-assets-jquery (>= 1.2.6)
-    rails-assets-jasmine (2.3.0)
-    rails-assets-jasmine-ajax (3.1.0)
-      rails-assets-jasmine (~> 2.0)
+    rails-assets-jasmine (2.3.1)
+    rails-assets-jasmine-ajax (3.1.1)
+      rails-assets-jasmine (~> 2)
     rails-assets-jeresig--jquery.hotkeys (0.2.0)
       rails-assets-jquery (>= 1.4.2)
     rails-assets-jquery (1.11.2)
@@ -781,7 +781,7 @@ DEPENDENCIES
   rails-assets-diaspora_jsxc (~> 0.1.1)!
   rails-assets-highlightjs (= 8.5.0)!
   rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
-  rails-assets-jasmine-ajax (= 3.1.0)!
+  rails-assets-jasmine-ajax (= 3.1.1)!
   rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
   rails-assets-jquery (= 1.11.2)!
   rails-assets-jquery-idletimer (= 1.0.1)!

spec/javascripts/app/views/bookmarklet_view_spec.js

@@ -49,8 +49,6 @@ describe('app.views.Bookmarklet', function() {
   });
 
   it('keeps the publisher disabled after successful post creation', function() {
-    jasmine.Ajax.install();
-
     init_bookmarklet(test_data);
     spec.content().find('form').submit();
 

spec/javascripts/app/views/poll_view_spec.js

@@ -23,7 +23,6 @@ describe("app.views.Poll", function(){
 
   describe("vote", function(){
     it("checks the ajax call for voting", function(){
-      jasmine.Ajax.install();
       var answer = this.view.poll.poll_answers[0];
       var poll = this.view.poll;