update
Merge branch 'master' of https://github.com/LabFer/CityGuide

Conflicts:

CityGiude.xcodeproj/project.xcworkspace/xcuserdata/timurkhazamov.xcuserd
atad/UserInterfaceState.xcuserstate
	CityGiude/GUI/PlaceMapViewController.m