PopUp Export
Merge branch 'master' of https://github.com/ubelab/mdtztest.git

Conflicts:
	MonstersDiscovery/js/app/PageShowManager.js