matching domaines + dates sur page d'accueil
Merge remote-tracking branch 'origin/master'
visualisation entités
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.scala
	app/views/index.scala.html
	conf/routes
	public/javascripts/index.js
articles par entité
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Application.scala
changements suite au merge