login
Merge branch 'master' of https://github.com/yys1993/yys

Conflicts:
	logic/src/main/java/cn/gyyx/yys/logic/dao/UserDao.java
	ui/src/main/java/cn/gyyx/yys/HomeController.java
	ui/src/main/webapp/WEB-INF/views/home.vm