Added import from directory
Made non editable
Added import from directory
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
Hide from ui : Protocol measurement & Individual, added MolgenisRole
Corrected help message according to current status quo
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps

Conflicts:
	apps/bbmri/plugins/welcome/BbmriWelcomeScreenPlugin.java
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
Updated help message page
Updated help message page
Merge pull request #386 from paraiko/master

several AnimalDb updates, bugfixes and test fixes
Merge pull request #388 from antonak/master

Changes in ui , help message