on image annotation and selection are now tied together. multiple selection working. annotations are assigned annotation API ID as on screen marker
Merge branch 'master' of https://github.com/catami/catami

Conflicts:
	webinterface/static/assets/backbone/templates/project-annotate-view.js
Re added code taken out during merge