added room loading functionality
added loading
Merge remote-tracking branch 'origin/master'