bedrock
update composer.json
Merge branch 'master' into feature/standalone

Conflicts:
	web/app/themes/cutnado/Gruntfile.js
	web/app/themes/cutnado/assets/css/main.min.css
	web/app/themes/cutnado/assets/js/plugins/bootstrap/affix.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/alert.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/button.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/carousel.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/collapse.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/dropdown.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/modal.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/popover.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/scrollspy.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/tab.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/tooltip.js
	web/app/themes/cutnado/assets/js/plugins/bootstrap/transition.js
	web/app/themes/cutnado/assets/sass/app.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_alerts.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_badges.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_bootstrap.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_breadcrumbs.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_button-groups.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_buttons.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_carousel.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_close.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_code.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_component-animations.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_dropdowns.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_forms.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_glyphicons.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_grid.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_input-groups.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_jumbotron.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_labels.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_list-group.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_media.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_mixins.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_modals.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_navbar.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_navs.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_normalize.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_pager.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_pagination.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_panels.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_popovers.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_print.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_progress-bars.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_responsive-utilities.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_scaffolding.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_tables.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_theme.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_thumbnails.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_tooltip.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_type.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_utilities.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_variables.scss
	web/app/themes/cutnado/assets/sass/bootstrap/_wells.scss
Merge branch 'feature/standalone' into develop