Merge branch 'master' of github.com:david-dogneton/pfe-semantic-news

Conflicts:
	app/controllers/Application.scala
	conf/routes
Merge branch 'master' of github.com:david-dogneton/pfe-semantic-news
Modification du get de l'utilisateur. Divers ajouts pour le moteur de recommandations.
Merge branch 'master' of github.com:david-dogneton/pfe-semantic-news

Conflicts:
	app/controllers/Application.scala
	app/models/Article.scala
	app/models/Entite.scala
	conf/routes