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

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

Update backend
Content, Create and Doc resources are rendered into Twitter Bootstrap
mark-up
Twitter Bootstrap used in remaining UI components
Merge pull request #219 from dlu-gs/feature/twb

Feature/twb
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!