Improved broad scale annotation view
Merge branch 'master' of https://github.com/catami/catami

Conflicts:
	webinterface/templates/webinterface/project-annotate.html