Refactor image building process
Merge branch 'master' of github.com:makinacorpus/vms

Conflicts:
	.gitignore
	docker/make.sh