another commit
Merge branch 'master' of https://github.com/EmilianParvanov/iCars-Proj

Conflicts:
	iCars/iCars/MMAppDelegate.m
another commit

nervi