Importer, validation.
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix test
Added multiline annotator support + cosmic annotator + unittest
fixed bug that caused result duplication
Added date converters
Added refresh method
Added importer test
Revert back to one labelattribute
refactored strings to constants, updated some copy/pasted comments
Merge pull request #1196 from bartcharbon/master

add cosmic annotator + multiline annotator support +refactoring and bug fixing of annotator classes
Rename
Prevent nullpointer
Added tests
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-data-annotators/src/main/java/org/molgenis/data/annotation/impl/EbiServiceAnnotator.java
	molgenis-data-omx/src/main/java/org/molgenis/data/omx/annotation/OmxDataSetAnnotator.java
Fix test
Fix merge
Merge pull request #1198 from erwinwinder/master

Import validation
Merge remote-tracking branch 'upstream/master'