change conf parse
change conf parse
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/channel/services.py
change conf parse
Merge remote-tracking branch 'origin/master'