Addition of channels creation
Merge remote branch 'origin/drogue-design'

Conflicts:
	index.php
Merge remote-tracking branch 'origin/master' into guimier
Added a default channel