Karen bug fix
Karen bug fix
Merge branch 'master' of https://github.com/davitbaghdagyulyan/CityClient

Conflicts:
	CityMobilDriver /CityMobilDriver/Main.storyboard
	CityMobilDriver /CreateProfilViewController.m
	CityMobilDriver /RobotSettingsViewController.m