no message
no message
Merge branch 'master' of https://github.com/jordsti/webflix08

Conflicts:
	pom.xml
	src/main/resources/ca/etsmtl/log660/configuration/Intervenant.hbm.xml
	src/main/resources/ca/etsmtl/log660/configuration/hibernate.cfg.xml