5-27  ming
Merge branch 'master' of https://github.com/TianJianWang/tjian into Branch_master

Conflicts:
	WebRoot/addTeam.jsp
	WebRoot/front/pages/listTeam.jsp
	WebRoot/front/pages/listTeamDetail.jsp
	WebRoot/front/pages/xiangqing.jsp
	src/com/tianjian/util/Picture.java
	src/ming.xml