Merge branch 'master' of https://github.com/psmagicman/think-global-hack-local into menu
Merge branch 'master' of https://github.com/psmagicman/think-global-hack-local into menu

Conflicts:
	src/users/UserManagementService.java
Merge branch 'menu' of https://github.com/psmagicman/think-global-hack-local into menu
helping voice along with menu text
game menu
Merge branch 'menu' of https://github.com/psmagicman/think-global-hack-local into menu