worked on test
Merge branch 'database' of https://github.com/genomizer/genomizer-server into database