added button for request data, not connected to plugin
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-protocolviewer/src/main/resources/templates/org/molgenis/omx/plugins/ProtocolViewer.ftl
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-protocolviewer/src/main/resources/templates/org/molgenis/omx/plugins/ProtocolViewer.ftl
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-protocolviewer/src/main/resources/templates/org/molgenis/omx/plugins/ProtocolViewer.ftl
merge
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
merge
:wqMerge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/service/OrderStudyDataService.java
Merge branch 'master' of https://github.com/molgenis/molgenis
Relative path
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #290 from georgebyelas/master

changed workflow
Added extra command line parameters (default, rundir, database). Added validation for a.o. wrongly specified parameterMappings of which origin (stepx_ or user_) is unclear. Fixed some bugs to make impute2 pipeline generating.
Added -path parameter to workflow.csv, parameters.csv, ... And fixed some bug.
Merge pull request #293 from mdijkstra/master

Created impute2 workflow. Added extra cmnd-ln-parameters. Fixed bugs. Added error handling for wrong parameterMapping.
simplify annotations using bean scoping, fix search security interceptor
Merge pull request #294 from dennishendriksen/master

Simplify annotations using bean scoping, fix search security interceptor