Game Page
Merge branch 'master' of https://github.com/npbtrac/1310-lilely

Conflicts:
	protected/views/game/index.php
	protected/views/user/event.php
	themes/default/javascripts/main.js
	themes/default/stylesheets/main.css