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

Conflicts:
	app/models/database/Country.scala