Preparing for delete annotaiton in accordance to the new api for
Annotations!
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop.git
into dev

Conflicts:
	src/model/GenomizerModel.java
	src/model/Model.java
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop.git into dev
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop.git
into dev

Conflicts:
	src/model/Model.java
Merge branch 'dev' of https://github.com/genomizer/genomizer-desktop.git
into dev