New api
Updates
Merge branch 'master' of https://github.com/tlomont/SnapMeCatz

Conflicts:
	Templates/down.tpl