...
Merge branch 'master' of https://github.com/Developmino/Automotive-Rep

Conflicts:
	Parkafari/res/layout/activity_main.xml