Vagrant Setup Done
Merge branch 'feature/server_setup' into develop