framework - Renamed a few functions and made it compatible with belt
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/app/framework.js