fixed path for vagrant (vmware fusion)
Merge branch 'dev' into production