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

websocket-gateway/spec/factories.rb

@@ -32,6 +32,13 @@ FactoryGirl.define do
   end
 
   factory :connection, :class => JamRuby::Connection do
+    addr 0
+    locidispid 0
+    latitude 0.0
+    longitude 0.0
+    countrycode 'US'
+    region 'TX'
+    city 'Austin'
     ip_address "1.1.1.1"
     as_musician true
   end