gameType reset to 0 if return to main menu is clicked.  Should fix the NPE.  New bug has appeared, unsure if related.
Merge branch 'master' into resyncGame