https
Merge branch 'master' of https://github.com/hubgit/metatato

Conflicts:
	static/scripts/controllers/settings.js