ELDP Development, Bugfixes
ELDP Improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/cmdi_maker.appcache
	build/js/script.js
	build/styles/styles.css
	src/js/core/app.config.js