2014-12-23 Helen 提交jar包
Merge remote-tracking branch 'origin/master'

Conflicts:
	sechand-platform/WebRoot/error.jsp