Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
fix: correct pilots calculation
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #391 from dennishendriksen/master

Fix description in protocol viewer
Merge branch 'master' of https://github.com/molgenis/molgenis
replaced catch with else after if statement
convert restApi uri to entity id in order to retrieve entities from controller
fixed a small bug
cleaned up the code
Merge pull request #385 from georgebyelas/master

Small fix: correct pilots calculation
Merge pull request #392 from ChaoPang/master

Fixed the bugs for download and order
removed the old function and replaced with new code
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #393 from ChaoPang/master

removed the old function and replaced with new code
Merge branch 'master' of https://github.com/molgenis/molgenis
Hide/show login tab based on configuration
Use modal login/register dialogs in the lifelines header
default for dialog setting added
Do show the login/account tab when user is logged in