Google Analytics (another test)
Merge branch 'master' of https://github.com/pgillet/Glue.git

Conflicts:
	glue-webapp/src/main/webapp/template.xhtml