Updated dependencies
Switch to new vagrant box
Merge branch 'vagrant-share' into 2.3
Merge branch '2.3' into 2.4

Conflicts:
	composer.json
	composer.lock
Merge branch '2.4'

Conflicts:
	composer.lock