navbar for annotation selector now working with the icicle view
Merge branch 'master' of https://github.com/catami/catami

Conflicts:
	webinterface/static/assets/backbone/templates/project-annotate-view.js