Commit correction
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/fr/imie/dao/impl/RightsAssocDAOPg.java