appDelegate
Merge branch 'master' of https://github.com/bizi/Whow-With-Me-New

Conflicts:
	appStoreScrollView/ChatWindowViewController.m
sss