Added vmware box
Merge branch 'master' into dev

Conflicts:
	Vagrantfile