demo functions & fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/modules/config/config.js
	app/modules/demo/demo.js