--- se last commit ---

Signed-off-by: Andre (home) <andre.ok@online.no>
Merge branch 'dev' of https://github.com/Andrioden/untitledgame.git into dev

Conflicts:
	game/static/js/game.js

Signed-off-by: Andre (home) <andre.ok@online.no>