test
Merge branch 'origin/master'

Conflicts:
	openTokDemo/openTokDemo/ViewControllers/HomeVC.m