Changes to filtering
Fixed filtering
Merge branch 'master' of https://github.com/iomekam/GTSafe

Conflicts:
	GTSafe/bin/GTSafe.apk
	GTSafe/bin/R.txt
	GTSafe/bin/classes.dex
	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/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/model/CrimeData.class
	GTSafe/bin/resources.ap_
	GTSafe/gen/com/example/gtsafe/R.java
	GTSafe/src/com/example/gtsafe/model/CrimeData.java
Merge branch 'master' of https://github.com/iomekam/GTSafe
A lot to do with the crime list
Merge branch 'master' of https://github.com/iomekam/GTSafe

Conflicts:
	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/MainActivity.class
	GTSafe/res/values/strings.xml