Aggiornamento stile popUp e canvas
Merge branch 'master' of https://github.com/ubelab/mdtztest.git

Conflicts:
	MonstersDiscovery/.rds_delta
	MonstersDiscovery/.sdk_delta.info
	MonstersDiscovery/js/app/PageShowManager.js