Merge remote-tracking branch 'origin/develop' into develop

web/app/controllers/api_join_requests_controller.rb

@@ -27,8 +27,7 @@ class ApiJoinRequestsController < ApiController
     
     if @join_request.errors.any?
       response.status = :unprocessable_entity
-      respond_with "You cannot join the session at this time."
-      # respond_with @join_request
+      respond_with @join_request
     else
       # send notification
       Notification.send_join_request(music_session, @join_request, text)

web/spec/requests/join_requests_api_spec.rb

@@ -80,7 +80,6 @@ describe "Join Request API", :type => :api do
   end
 
   it "can't create duplicate join_request" do
-    pending
     login(other)
 
     post '/api/join_requests.json', { :music_session => user.music_sessions[0].id, :text => "lemme in" }.to_json, "CONTENT_TYPE" => 'application/json'