edit
Merge branch 'master' of https://github.com/xiaoice/zte

Conflicts:
	WebRoot/jsp/user/index.jsp