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
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Logos for biomed bridges
removed text since it is not supported yet
improve generation speed
resolve warning
Merge pull request #306 from dennishendriksen/master

Improve generation performance
Merge pull request #307 from bartcharbon/master

fixed import Stringutils in LifeLinesDataDictionaryToOmxConvertor
add jquery ui css