fix
Merge remote-tracking branch 'origin/develop'
fix + improve
Merge branch 'bk_master' into develop

Conflicts:
	app.js
	core/scripts/modules/appConfig.js
	core/scripts/modules/routes.js
	package.json
	tasks/processors/imageWritingProcessor.js