changes for arc
Merge branch 'master' of github.com:duncanjbrown/Archetype

Conflicts:
	js/facebook.js