init to git
ffff

fff
Merge branch 'master' of https://github.com/khcjump/C32E65D9

Conflicts:
	app.js
	module/mframe/control/mframeControl.js
	module/mframe/view/mframeView.js
	nbproject/private/private.xml