Merge pull request #234 from ehannum/controllers

Controllers, flight stick, keyboard all working and implemented with Oculus
create room and join room bug fixed
Merge branch 'dev' into controllers