New broad scale annotation html and backbone view
Merge branch 'master' of https://github.com/catami/catami

Conflicts:
	webinterface/static/assets/backbone/templates/project-annotate-view.js
	webinterface/templates/webinterface/project-annotate.html
Broad Scale annotation updated for thumbnail selection global trigger