xxxx
merge update
Merge branch '5.0.x' of https://github.com/txteam/webdemo.git into 5.0.x

Conflicts:
	.settings/org.eclipse.wst.common.component