Virtualhost file location fixed.
Merge branch 'master' into production