sync up with the master branch

sync up with the master branch
Merge remote-tracking branch 'origin/Charles' into Charles

Conflicts:
	ec/WebContent/index.html