f
f
Merge pull request #1 from zuroc/master

merge the latest .
Merge branch 'master' into devops-docuement-install-guide

Conflicts:
	docker.md