Edits done during meeting 10-15-14, Added Conversation view push when clicking person.
Merge branch 'master' of github.com:smurphylaw/BlocTalk

Conflicts:
	BlocTalk/Base.lproj/Main.storyboard
	BlocTalk/HomeScreenCollectionViewController.m