Sm�saker i edit
Merge branch 'master' of https://github.com/genomizer/genomizer-sysadmin-web

Conflicts:
	src/collections/Annotations.js
	src/templates/EditTemplate.html
	src/views/EditView.js
Merge branch 'master' of https://github.com/genomizer/genomizer-sysadmin-web