fusion
Merge branch 'master' of https://github.com/bastien612/portail

Conflicts:
	hook/${liferay_home}/deploy/hook-0.0.1-SNAPSHOT.war