Fix issue #160 and #182
Merge remote-tracking branch 'origin/master' into 2.3

Conflicts:
	Off the Record.xcodeproj/project.pbxproj
	Off the Record/OTRChatBubbleView.m
fixes for strings and merge