-Added 2 custom buttons for testing purposes
-Changed text view on map to be a brighter color
-Fixed polygon tracking. Added a temporary dialog box for now. Will fully implement later
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/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/bin/classes/com/example/gtsafe/library/MapHelper.class
	GTSafe/gen/com/example/gtsafe/R.java
	GTSafe/src/com/example/gtsafe/CrimeMapActivity.java
	GTSafe/src/com/example/gtsafe/library/MapHelper.java