merge with molgenis master branch
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Removed unused code
Use typed methods
Fix forms for omx repos
Merge pull request #1423 from dennishendriksen/master

Fix: check for protocol with no features
Merge branch 'master' of https://github.com/molgenis/molgenis
added synchronous protocol index function
remove annotation
Use java 1.7
EntityClass details
Merge pull request #1424 from bartcharbon/master

added synchronous protocol index function
Merge branch 'master' of https://github.com/molgenis/molgenis
fix natural sorting catalogtree
Merge branch 'master' of https://github.com/molgenis/molgenis
Prettyfied the details screen
Merge pull request #1426 from bartcharbon/master

fix natural sorting catalogtree
Fix model xml
Handle comments