解决冲突
Merge branch 'master' of https://github.com/rotek/rotek

Conflicts:
	src/main/webapp/WEB-INF/jsp/admin/login/login.jsp