modified index.html - didn't add commits from git
Merge origin/master

Conflicts:
	web/index.xhtml