consistent buttons
Merge branch 'master' of https://github.com/iamRoyLin/numerous

Conflicts:
	www/core/controllers/GroupingGameController.js
	www/core/views/GroupingGameView.js