Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
automated merge
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
CategoryRepository exception for protocols without features
Merge pull request #1420 from dennishendriksen/master

CategoryRepository exception for protocols without features
Fix Unload does not work (molgenis #1421 also related to
molgenis-lifelines #64)
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1422 from jjettenn/master

 Fix: Unload does not work (molgenis #1421 also related to molgenis-lifelines #64)
Merge pull request #1419 from erwinwinder/master

Convert empty strings to null
Removed unused code
Use typed methods
Fix forms for omx repos
Fix: check for protocol with no features
Merge pull request #1423 from dennishendriksen/master

Fix: check for protocol with no features
Merge branch 'master' of https://github.com/molgenis/molgenis
Use java 1.7
EntityClass details