commit
Merge branch 'master' of http://github.com/iomekam/gtsafe

Conflicts:
	GTSafe/bin/R.txt
	GTSafe/bin/classes/com/example/gtsafe/CrimeMapActivity.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity$7.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity$8.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity$9.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity.class
	GTSafe/bin/classes/com/example/gtsafe/R$id.class
	GTSafe/bin/classes/com/example/gtsafe/R$integer.class
	GTSafe/bin/classes/com/example/gtsafe/R$layout.class
	GTSafe/bin/classes/com/example/gtsafe/R$menu.class
	GTSafe/bin/classes/com/example/gtsafe/R$string.class
	GTSafe/bin/classes/com/example/gtsafe/R$style.class
	GTSafe/bin/classes/com/example/gtsafe/R$styleable.class
	GTSafe/bin/classes/com/example/gtsafe/R$xml.class
	GTSafe/bin/classes/com/example/gtsafe/library/MapHelper$1.class
	GTSafe/gen/com/example/gtsafe/R.java
	google-play-services_lib/bin/google-play-services_lib.jar
	google-play-services_lib/gen/com/google/android/gms/R.java