Resend failed message button

Added an option to present a sending failure button for resending the
failed message
Resolved conflict

Resolved conflict in JSQMessagesCollectionViewCell.m