gestion absence d'images sur les articles
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/entite.scala.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/entite.scala.html
Merge remote-tracking branch 'origin/master'
recherche fonctionnelle