Channel Model is Done...
User is Corrected
Merge remote-tracking branch 'origin/master'

Conflicts:
	MainAPP/forms/AdminForms.py
	MainAPP/models.py
Channle is done