page article.jsp
Merge branch 'master' of https://github.com/ydn47/cinepantin

Conflicts:
	src/fr/demos/pms/dao/ArticleDaoJPA.java