Implementation Flux actualite partage contenu
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/private/home.jsp
Fix merge