more fixes during framework build (not working)
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/belt-app.min.js