[c]
Merge branch 'master' of https://github.com/szmachinsky/_IOS_Test

Conflicts:
	_TEST_PROJ/TaxiTest/TaxiTest/TMapViewController.xib
	_TEST_PROJ/Test_1/Test_1/GesturesViewController.xib