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

Conflicts:
	www/core/controllers/GroupingGameController.js
	www/core/views/GroupingGameView.js
Revert "Merge branch 'master' of https://github.com/iamRoyLin/numerous"

This reverts commit 52075208d68b81a73d08554f44d9f6bc25645f96, reversing
changes made to 9dbdfb81d064b4c4f3d504d841375dfba95f11e7.
fix
consistent buttons
fix
Revert "added animations for error made"

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