Merge branch 'Update' into Jean

Conflicts:
	WebContent/index.html