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

Conflicts:
	index.php