create room and join room bug fixed
Merge branch 'dev' into controllers
Merge pull request #235 from ehannum/controllers

Create room and join room bug fixed