Bugfix: All resource files are invalid
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/cmdi_maker.appcache
	build/scripts/script.js
New build