Merge master endpoint code in vagrant
9 files changed