+ LocationManager
Merge branch 'master' of https://github.com/DmIvanov/MapApp

Conflicts:
	MapAppGit/MapAppGit.xcodeproj/project.pbxproj