unstaged
Merge branch 'master' of https://github.com/cleroy/hostilecontacts

Conflicts:
	static/libraries/js/drawboard.js
	templates/game.html