ef
Merge branch 'master' of https://github.com/iomekam/GTSafe

Conflicts:
	GTSafe/bin/classes/com/example/gtsafe/CrimeLogActivity.class
ju
Merge branch 'master' of https://github.com/iomekam/GTSafe

Conflicts:
	google-play-services_lib/bin/google-play-services_lib.jar
-Fixed the manifest :(