Merge branch 'master' of https://github.com/zhoubo8308/pls

Conflicts:
	src/main/webapp/resources/css/user.css