loginuser模块 相关的文件
Merge branch 'develop' of https://github.com/rayliu/j-eeda into develop

Conflicts:
	WebRoot/WEB-INF/template/yh/layout.html
	WebRoot/WEB-INF/template/yh/loginUser.html
	src/config/EedaConfig.java