modified.
Merge branch 'master' of https://github.com/inokappa/dockerfiles

Conflicts:
	mysql/Dockerfile
Merge branch 'master' of https://github.com/inokappa/dockerfiles
Merge branch 'master' of https://github.com/inokappa/dockerfiles
add Zookeeper