a
Merge branch 'master' of https://github.com/520pxs520/android_car

Conflicts:
	Car/bin/R.txt
	Car/bin/classes/com/next/core_ng/R$id.class
	Car/bin/classes/com/sky/car/R$id.class
	Car/bin/classes/com/sky/car/adapter/BrandAdapter.class
	Car/bin/classes/com/sky/car/adapter/CarsAdapter.class
	Car/bin/classes/com/sky/car/home/WashMapActivity$1.class
	Car/bin/classes/com/sky/car/myself/MyselfFragment.class
	Car/bin/classes/com/sky/car/widget/SHListView.class
	Car/bin/classes/com/sky/widget/R$id.class
	Car/gen/com/sky/car/R.java