updating local. couldn't without committing
Merge branch 'develop' of https://github.com/lakoesmw/car-sales-android into develop

Conflicts:
	car-sales-android/app/app.iml
Merge branch 'develop' of https://github.com/lakoesmw/car-sales-android into develop
Merge branch 'develop' of https://github.com/lakoesmw/car-sales-android into develop

Conflicts:
	car-sales-android/app/app.iml
added vehicle list stuff
Merge branch 'develop' of https://github.com/lakoesmw/car-sales-android into develop
updated vehicle list. click now passes iBeacon number to Vehicle detail view in a bundle
Merge branch 'develop' of https://github.com/lakoesmw/car-sales-android into develop