Merge branch 'master' of https://github.com/jazzwang/hadoop4win

Conflicts:
	files/download.sh
	hadoop4win-full.nsi
Merge branch 'master' of https://github.com/jazzwang/hadoop4win