accidental commit
refactored EbiServiceAnnotator to be streaming
removed generated comments
changes after pullrequest comments + refactored common code to superclass + create mechanism for multiple annotation results
fix rest api sorting
Merge pull request #1188 from bartcharbon/master

refactor ebiServiceAnnotator + remove accidental commit - breaks build
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/genericdataexplorer
remove hardcoded spring version
Fix data set import
update spring to 4.0.2, spring security to 3.2.1, make sure only these versions are used
update spring to 4.0.2, spring security to 3.2.1, make sure only these versions are used
Merge branch 'feature/genericdataexplorer' of https://github.com/molgenis/molgenis into feature/genericdataexplorer
rest controller bug fix, fix tests
Merge pull request #1191 from dennishendriksen/feature/genericdataexplorer

Fix REST API sorting and data set importer + small stuff