Clery Act View (with adapters)
Merge branch 'master' of http://github.com/iomekam/GTSafe

Conflicts:
	GTSafe/bin/GTSafe.apk
	GTSafe/bin/R.txt
	GTSafe/bin/classes.dex
	GTSafe/bin/classes/com/example/gtsafe/CleryActActivity.class
	GTSafe/bin/classes/com/example/gtsafe/CrimeLogActivity.class
	GTSafe/bin/classes/com/example/gtsafe/CrimeStatActivity.class
	GTSafe/bin/classes/com/example/gtsafe/DataActivity.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$attr.class
	GTSafe/bin/classes/com/example/gtsafe/R$color.class
	GTSafe/bin/classes/com/example/gtsafe/R$dimen.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/R.class
	GTSafe/bin/resources.ap_
	GTSafe/gen/com/example/gtsafe/R.java
Merge branch 'master' of http://github.com/iomekam/GTSafe

Conflicts:
	GTSafe/AndroidManifest.xml
	GTSafe/bin/AndroidManifest.xml
	GTSafe/bin/GTSafe.apk
	GTSafe/bin/R.txt
	GTSafe/bin/classes.dex
	GTSafe/bin/classes/com/example/gtsafe/CleryActActivity.class
	GTSafe/bin/classes/com/example/gtsafe/CrimeLogActivity.class
	GTSafe/bin/classes/com/example/gtsafe/CrimeMapActivity.class
	GTSafe/bin/classes/com/example/gtsafe/CrimeStatActivity.class
	GTSafe/bin/classes/com/example/gtsafe/DataActivity.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity.class
	GTSafe/bin/classes/com/example/gtsafe/R$attr.class
	GTSafe/bin/classes/com/example/gtsafe/R$color.class
	GTSafe/bin/classes/com/example/gtsafe/R$dimen.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/R.class
	GTSafe/bin/classes/com/example/gtsafe/library/MapHelper.class
	GTSafe/bin/resources.ap_
	GTSafe/gen/com/example/gtsafe/R.java
	GTSafe/res/values/strings.xml
	google-play-services_lib/bin/google-play-services_lib.jar
Working on clery acts
Merge branch 'master' of http://github.com/iomekam/GTSafe

Conflicts:
	GTSafe/bin/GTSafe.apk
	GTSafe/bin/R.txt
	GTSafe/bin/classes.dex
	GTSafe/bin/classes/com/example/gtsafe/CleryActActivity.class
	GTSafe/bin/classes/com/example/gtsafe/CrimeLogActivity.class
	GTSafe/bin/classes/com/example/gtsafe/CrimeMapActivity.class
	GTSafe/bin/classes/com/example/gtsafe/CrimeStatActivity.class
	GTSafe/bin/classes/com/example/gtsafe/DataActivity.class
	GTSafe/bin/classes/com/example/gtsafe/MainActivity.class
	GTSafe/bin/classes/com/example/gtsafe/R$attr.class
	GTSafe/bin/classes/com/example/gtsafe/R$color.class
	GTSafe/bin/classes/com/example/gtsafe/R$dimen.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$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/R.class
	GTSafe/bin/resources.ap_
	GTSafe/gen/com/example/gtsafe/R.java
Deleted trash
Merge branch 'master' of http://github.com/iomekam/GTSafe