Working blob
Merge branch 'master' of https://github.com/donaldpcook/facam

Conflicts:
	www/js/home/home.js
	www/js/services/svg.js