Little square follows your mouse
Merge branch 'dev' of https://github.com/Cholera-Infrastructure-Game/CholeraGame into dev

Conflicts:
	deploy_without_grunt/js/src/game/mapStage.js
Merge branch 'dev' of https://github.com/Cholera-Infrastructure-Game/CholeraGame into dev