maj actus
Merge branch 'dev'

Conflicts:
	Documents/news.xml