adjust iframe height so that footer is always visible
Merge branch 'master' of https://github.com/molgenis/molgenis
Refactored ProtocolViewerContoller to spring controller
Change viewname
Merge pull request #707 from erwinwinder/master

Refactored ProtocolViewerContoller to spring controller
update dependencies to new snapshot dependencies
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #708 from dennishendriksen/master

Update dependencies to new snapshot dependencies
Added first version of barcode selector
Merge pull request #710 from mdijkstra/master

Added first version of barcode selector
CbmToOmxConverter to Spring plugin
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #711 from bartcharbon/master

CbmToOmxConverter to Spring plugin
Merge pull request #709 from RoanKanninga/master

added the HomePlugin
fix merge