index page changed
index page changed
index page changed
index page changed
Merge origin/origin into origin

Conflicts:
	web/index.xhtml
	web/resources/css/styles.css
	web/resources/images/logo.jpg
	web/section/header.xhtml