hacks for Fetch
Merge branch 'develop'

Conflicts:
	JSQMessagesViewController/Views/JSQMessagesCollectionViewCellIncoming.xib
	JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib