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
deleted unused modules in the build script,
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
make print labels also a shiny jquery button.
fix paging sql exception bug in matrixviewer
updates to layout of parentgroup screen.
add 32px version of new icon
layout tweaks for breeding plugin
layout tweaks
layout tweaks
add close button to filter and add/remove column div in matrixviewer +
small layout tweaks.
work in progress on breeding plugin
Merge branch 'testing' of github.com:molgenis/molgenis_apps
added editfunctionality to the selenium test of AnimalDB