The first submission of project
update
Merge branch 'master' of https://github.com/jiangbo12345/zazatao.git

Conflicts:
	WebContent/WEB-INF/context/applicationContext-dataaccess.xml
	WebContent/WEB-INF/web.xml
	WebContent/content/views/default/index.jsp
	WebContent/content/views/default/user/register.jsp
	WebContent/index.jsp
	src/com/yc/controller/IndexController.java
	src/com/yc/dao/orm/commons/GenericDaoConfig.java
	src/com/yc/entity/user/User.java
	src/com/yc/filter/LoginFilter.java
	src/com/yc/service/IUserService.java
	src/com/yc/service/impl/UserService.java