new
Merge branch 'master' of https://github.com/Juicec/mccoy

Conflicts:
	web/sites/mccoy/docroot/js/main.js