Merge pull request #13 from dennishendriksen/master

Catalog manager and study manager + small changes
Merge pull request #14 from dennishendriksen/master

Set default permissions on order plugin
Changed forms plugin urls to fix inconsistent urls
Merge pull request #15 from dennishendriksen/master

Remove MOLGENIS UI framework
Merge branch 'master' of https://github.com/molgenis/molgenis-lifelines

Conflicts:
	src/main/resources/molgenis_ui.xml
Merge pull request #16 from erwinwinder/master

Changed forms plugin urls to fix inconsistent urls
Merge branch 'master' of https://github.com/molgenis/molgenis-lifelines
fix molgenis_ui.xml, remove old plugins