commit de regul de conflit
Merge branch 'master' of https://github.com/ydn47/cinepantin

Conflicts:
	WebContent/Article.jsp