10.2.2
Merge branch 'master' of https://github.com/wayne0332/xiaojh into wayne0332-master

Conflicts:
	WebRoot/WEB-INF/web/forepart/myFocus.jsp
Merge pull request #16 from CacheCake/master

合并