Merge branch 'master' of https://github.com/koninka/monsterquest

Conflicts:
	MonsterQuest/engine/engine.go
	MonsterQuest/game/index.html
	MonsterQuest/handlers/handlers.go
	MonsterQuest/js/game.js
	MonsterQuest/js/monster_chat.js
	MonsterQuest/js/registration.js