Merge branch 'master' of https://github.com/loveXiaoiao/quikstart.git

Conflicts:
	src/main/webapp/WEB-INF/views/manage/userAdd.jsp
Merge branch 'master' of https://github.com/loveXiaoiao/quikstart.git