Updated
Merge branch 'master' of https://github.com/hughbrien/docker-hadoop-1.2.1
fixed

Conflicts:
	Dockerfile