Structure site type masterPage
Merge remote-tracking branch 'origin/master'

Conflicts:
	sujet2/src/main/webapp/index.xhtml