Trying to fix pricescreen
Merge branch 'master' of https://github.com/matsvm/Maurice

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