rearranged code
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/game.tpl
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/game.tpl
fix
Merge remote-tracking branch 'origin/master'
some fixes for unlimited events
some fixes for unlimited events
fix