Merge branch 'hotfix/0.3.3'
Merge branch 'master' into develop

Conflicts:
	bower.json
	dist/cc-prefs.js
	dist/cc-prefs.min.js
	package.json