Extra annotation tests.
Merge branch 'database' of
https://github.com/genomizer/genomizer-server.git into database

Conflicts:
	src/database/subClasses/GenomeMethods.java