test commit on new branch
Merge branch 'sysadmin' of https://github.com/genomizer/genomizer-web into sysadmin
testing
test commits
integrating...............
create annotation now sort of works on main web-repo
started integrated edit view
Testing solutions to edit-view
fixed deletion etc.
disabled broken searchfield
test on router
nav-bar + reorganized all view code
Merge branch 'sysadmin'

Conflicts:
	app/js/router.js
Merge branch 'master' of https://github.com/genomizer/genomizer-web