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

Conflicts:
	GTSafe/bin/R.txt
	GTSafe/bin/classes/com/example/gtsafe/CrimeMapActivity$1.class
	GTSafe/bin/classes/com/example/gtsafe/CrimeMapActivity.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity$1.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity$2.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity$3.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity$4.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity$5.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity$6.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$drawable.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