Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

ruby/spec/jam_ruby/models/track_spec.rb

@@ -116,8 +116,8 @@ describe Track do
       tracks = Track.sync(connection.client_id, [{:id => track.id, :client_track_id => track.client_track_id, :sound => track.sound, :instrument_id => track.instrument_id}])
       tracks.length.should == 1
       found = tracks[0]
-      found.id.should == track.id
-      found.updated_at.should == track.updated_at
+      expect(found.id).to eq track.id
+      expect(found.updated_at.to_i).to eq track.updated_at.to_i
     end
   end
 end