Merge remote-tracking branch 'origin/Charles' into Charles

Conflicts:
	ec/WebContent/index.html