Commiting before merge
Merge branch 'master' of https://github.com/iccthedral/craftia

Conflicts:
	www/css/craftia-theme.css
	www/js/directives/ccUploadPhotos.js
	www/shared
	www/vendor/holderjs/package.json