Merge branch 'dev'
v0.3.0
Merge branch 'dev'

Conflicts:
	src/first-init.command
	src/vagrant_up.command
Update README.md
Merge branch 'master' into dev