Updated folder structure

- Removed root “WebContent”
Merge branch 'master' into v1.0

Conflicts:
	WebContent/js/page.js
	index.html
	js/index.js
	js/page.js~HEAD