Merge jauge
Merge branch 'master' of https://github.com/HeyHumansGames/marvel-of-technology

Conflicts:
	public/scripts/inputscenemain.js