Revert "group work"

This reverts commit 7bcff4f85d8d19f45a3fcc9ed87fa5c988f548ff. This revert was necessary as some code from an old branch made it into this code, and a simple merge sucks.

Conflicts:
	TextSecureiOS/MessagesManager/TSMessagesManager.mm
	TextSecureiOS/ViewControllers/Conversations/TSMessageViewController.m