Bughunt scene 5
Merge branch 'master' of github.com:shitsumon/MMProject12

Conflicts:
	js/core/helper.js