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

Conflicts:
	app/controllers/Application.scala
	conf/routes
Merge remote-tracking branch 'origin/master'