do the room instancing after all json has been loaded
lengthen client timeout
Merge remote-tracking branch 'upstream/master'