Merge branch 'master' of https://github.com/duddesuyo/TCommune.git
Merge branch 'master' of https://github.com/duddesuyo/TCommune.git

Conflicts:
	src/main/webapp/WEB-INF/tags/homeTemplate.tag