smthng
Merge branch 'master' of https://github.com/sashgorokhov/Bottled-Sportcourts

Conflicts:
	views/game.tpl
	views/game_head.tpl