Lvl design -> 7
Merge branch 'non-retina-test' of https://github.com/matsvm/Maurice into non-retina-test

Conflicts:
	js/classes/Game.js
	xml/tourmap.xml