develop3
Merge branch 'develop3' into develop2

Conflicts:
	AntDemo/WebContent/index.jsp