-
Merge remote-tracking branch 'origin/master' into valik_branch

Conflicts:
	Pods/Pods.xcodeproj/xcuserdata/Valentin.xcuserdatad/xcschemes/Pods-AFNetworking.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/Valentin.xcuserdatad/xcschemes/Pods.xcscheme
	Pods/Pods.xcodeproj/xcuserdata/Valentin.xcuserdatad/xcschemes/xcschememanagement.plist
	TaxiFriday.xcworkspace/xcuserdata/Valentin.xcuserdatad/UserInterfaceState.xcuserstate