Fixed onGameJoined Bugs
Merge branch 'development' into JK
Merge branch 'development' into JK
Merge branch 'JK' into development