Merge conflict.
Merge branch 'master' of https://github.com/pgillet/Glue.git

Conflicts:
	glue-webapp/src/main/webapp/template.xhtml
Pascal modifications.
Create database with charset UTF8.