20140721系统更新功能提交
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/jsp/manager/default.jsp