Merge branch 'develop' of github.com:vivoportal/vivoportal into develop
Merge branch 'develop' of github.com:vivoportal/vivoportal into develop
WIP update of explorer
Merge branch 'develop' of github.com:vivoportal/vivoportal into develop
Merge pull request #126 from zstanek/develop

WIP update of explorer