r
Merge branch 'master' of
https://github.com/nguyenvandan/hadoop-definitive-guide.git

Conflicts:
	mapreduce-application/src/test/resources/ hadoop-cluster.xml