Merge remote-tracking branch 'v2/feature/backend' into update-develop

Conflicts:
	composer.json
	composer.lock
	module/Vivo/config/backend.config.php
Merge pull request #218 from dlu-gs/update-develop

Update develop
WIP - Backend UI / editor
Merge branch 'feature/backend' of https://github.com/vivoportal/v2 into feature/ui-backend
Merge branch 'develop' of https://github.com/vivoportal/v2 into feature/ui-backend
WIP - Backend UI / editor
Merge remote-tracking branch 'v2/feature/backend' into update-develop

Conflicts:
	composer.json
	composer.lock
	module/Vivo/config/backend.config.php
Merge pull request #220 from dlu-gs/update-develop

Update develop - run composer update!
Merge branch 'feature/backend' of https://github.com/vivoportal/v2 into feature/ui-backend
Merge branch 'develop' of https://github.com/vivoportal/v2 into feature/ui-backend
Merge branch 'feature/backend' of https://github.com/vivoportal/v2 into feature/ui-backend
Merge remote-tracking branch 'v2/feature/backend' into update-develop
Merge pull request #223 from dlu-gs/update-develop

Update develop
Merge branch 'feature/backend' of https://github.com/vivoportal/v2 into feature/ui-backend
Merge branch 'develop' of https://github.com/vivoportal/v2 into feature/ui-backend
WIP - Backend UI / ribbon + sitechooser
Merge pull request #225 from zstanek/feature/ui-backend

Feature/ui backend