Merge pull request #936 from dennishendriksen/feature/studydefinitionservice

Fix tests + big fix in getCurrentUsername
Merge pull request #938 from dennishendriksen/feature/studydefinitionservice

Minor Query and DataService interface updates + small changes/fixes
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/studydefinitionservice