Merge branch 'master' of https://github.com/jbrosi/mayrogue into jbrosi-master

Conflicts:
	frontend/dispatch.js