[STARTUP] Vagrant

Conflicts:
	web/app_dev.php