Working on Observ-OM v3
Fix for DesignGG: temp file dir / working dir
Updated DesignGG, previous version did not work for R > 2.10
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 with testing
Merge branch 'testing' of github.com:molgenis/molgenis_apps
Merge branch 'testing' of https://github.com/molgenis/molgenis_apps
Merge branch 'testing' of github.com:molgenis/molgenis_apps
Improvements and a fix for archiver test
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
Bugfix: generated bad R script due to different request parsing