merge maincontroller
change language
Merge branch 'master' of https://github.com/justinliucs/haflow.git

Conflicts:
	src/main/java/haflow/ui/controller/MainLogonController.java
	src/main/webapp/WEB-INF/views/main.jsp
	src/main/webapp/script/haflow.hdfs.js