local changes to mainjs
Merge branch 'master' of https://github.com/stevepofd/yolo-octo-archer

Conflicts:
	assets/js/main.js
colori menu - testo mappa - testo sez Ecc Roma