1.1.2-1 reconstruct pre-release
Merge branch 'master' of https://github.com/xianglei/easyhadoop into develop

Conflicts:
	EasyHadoopCentral/application/views/login_form.php