added animations to tray
fixed conflict
Merge branch 'master' of https://github.com/iamRoyLin/numerous

Conflicts:
	www/core/views/GroupingGameView.js