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

Conflicts:
	views/editgame.tpl
	views/list.tpl