Vagrant migration
Merge pull request #19 from OpenDTP/dev/ref#155

Vagrant migration
Fix merge conflict