whole image annotation API and tests
Merge branch 'master' of https://github.com/catami/catami

Conflicts:
	projects/api.py