Add extra DocumentRoot symlink -> /vagrant
Merge branch 'dev'