Merge branch 'master' of https://github.com/beeriza/CarPal

Conflicts:
	app/src/main/AndroidManifest.xml