dfsfsdf
Merge remote-tracking branch 'origin/Addchannel' into sprint4changes

Conflicts:
	SmapleGittest/SmapleGittest/ICEAppDelegate.h