Edit changes
Merge branch 'master' of https://github.com/genomizer/genomizer-sysadmin-web

Conflicts:
	src/templates/AnnotationList.html
	src/views/AnnotationListView.js