initial changes to scene2
Merge branch 'master' of github.com:shitsumon/MMProject12
Erste aenderungen fuer szene 2
Merge branch 'master' of github.com:shitsumon/MMProject12

Conflicts:
	js/core/dialogControl.js