Updates
Merge branch 'master' of https://github.com/Craith/browsergame

Conflicts:
	db/db.sqlite