VP-243 Minor refactoring
Merge branch 'develop' of https://github.com/vivoportal/vivoportal into feature/vp-243-js-merging
Merge pull request #270 from dlu-gs/feature/vp-243-js-merging

Feature/vp 243 js merging