Merge branch 'master' of https://github.com/janitha000/TaxiSecurity

Conflicts:
	bin/TaxiSecurity.apk
	bin/classes.dex

	bin/classes/com/example/taxisecurity/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/taxisecurity/MainActivity.class
	bin/resources.ap_

	google_play_services/google-play-services_lib/bin/google-play-services_lib.jar