smth
Merge branch 'master' of https://github.com/Buratinkalol/Frontend

Conflicts:
	templates/game.xml
WorkVersion