small changes
Merge branch 'master' of https://github.com/motocoin-dev/motocoin

Conflicts:
	src/game/game.cpp