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
Added login to compute db
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-compute-db/src/main/java/org/molgenis/compute/db/generator/TaskGeneratorDB.java
Merge pull request #297 from erwinwinder/master

Added login to compute db
Merge pull request #298 from mdijkstra/master

Fixed bugs. Improved compute.properties class.
changed the automatic reload configuration, the reload is now triggered by an enter in the console
changed the automatic reload configuration.....