Added ShowLocationViewController
Merge branch 'master' of https://github.com/stefanNaumov/Mokap

Conflicts:

ChatApp/ChatApp.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdat
ad/UserInterfaceState.xcuserstate
	ChatApp/ChatApp/Base.lproj/Main.storyboard
	ChatApp/ChatApp/HomeScreenAnimationsGenerator.m