merge class Album et Article.
ArticleDAOImplJPAtest terminé, OK
merge
Merge branch 'master' of https://github.com/Gaetan59/Projet-JavaM2I

Conflicts:
	pom.xml
	src/test/java/com/formation/virgin/model/dao/impl/ClientDAOImplJPATest.java