CarPal Barry Main
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/drawable-ldpi/yes.png
	app/src/main/res/drawable-mdpi/caricon.png
	app/src/main/res/drawable-xhdpi/caricon.png
	app/src/main/res/drawable-xxhdpi/caricon.png
CarPal Barry Main