Merge branch 'nightly' into dev

* nightly:
  made the vagrant installation
Merge branch 'dev' into nightly

* dev: