https://jira.injoit.com/browse/FBRADAR-45
https://jira.injoit.com/browse/FBRADAR-45
Merge remote-tracking branch 'origin/1.3.0ver' into 1.3.0ver

Conflicts:
	Chattar.xcodeproj/project.pbxproj