fix: config definition
fix: config definition
Merge branch 'master' into html

Conflicts:
	Gruntfile.js
Merge branch 'html' into static-angularjs

Conflicts:
	Gruntfile.js