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

Conflicts:
	CityMobilDriver/CityMobilDriver.xcodeproj/project.xcworkspace/xcshareddata/CityMobilDriver.xccheckout