date retour à la tentative initiale
Merge branch 'master' of github.com:david-dogneton/pfe-semantic-news

Conflicts:
	app/models/Article.scala