Channel.php modified
Merge remote branch 'origin/guimier' into teyssier-fichiers

Conflicts:
	common/entities/channels/Channel.php
Merge and date modified
Merge remote branch 'origin/guimier' into teyssier-fichiers