update
Merge branch 'master' of https://github.com/huyvu1310/CatchCar

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/CatchCar.apk
	bin/classes.dex
	bin/resources.ap_
	src/vn/edu/ptit/android/activity/MainActivity2.java