Use cc-prefs 0.3.6
Merge branch 'hotfix/0.3.4'
Merge tag '0.3.4' into develop

0.3.4

Conflicts:
	bower.json
	package.json