After rollback
Merge branch 'Averse_Destination' of https://github.com/janitha000/TaxiSecurity into Averse_Destination

Conflicts:
	bin/TaxiSecurity.apk
	bin/resources.ap_