Minor refactoring
Temporary ontologies fix
Merge branch 'master' of https://github.com/thehyve/GDT

Conflicts:
	grails-app/controllers/org/dbnp/gdt/TermEditorController.groovy