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
Added ComputeRunDecorator
Merge branch 'master' of https://github.com/molgenis/molgenis
PilotService per run
Resubmit failed jobs
Merge pull request #254 from mswertz/master

updated README.md following comments GB and PD
Created getEnvironment(compute) function that returns a text string and can thus easily be called by computeDB
Merge pull request #255 from mdijkstra/master

Created getEnvironment(compute) function that returns a text string and can thus easily be called by computeDB
Merge branch 'master' of https://github.com/molgenis/molgenis
fix for issue #256 " Database connection time out exceptions\
Merge pull request #257 from dennishendriksen/master

Database connection time-out fix
#248: Admin has also no access to system entities (MolgenisUser,
MolgenisGroup etc)
System.out.println removed
Merge branch 'master' of https://github.com/molgenis/molgenis
#248: Admin has also no access to system entities (MolgenisUser,
MolgenisGroup etc)
#248: Admin has also no access to system entities (MolgenisUser,
MolgenisGroup etc)