fix vagrant bug
Merge branch 'develop' into elasticsearch