added Bootstrap Bundle to composer config
Merge branch 'vdv-origin/master'

Conflicts:
	composer.json
	composer.lock