xcuserdata Stop Track
Merge branch 'master' of https://github.com/ryums0227/9vhg8qnkj3Evkla90AEGaz31

Conflicts:
	KEVINET/GhostTalk/GhostTalk/FriendsViewController.m