Woot Woot
Merge branch 'master' of https://github.com/dmoreh/spotco-template

Conflicts:
	settings/templateSettings.js