-Worked on the custom window layout. Stuff broke. Being resolved
Merge branch 'master' of https://github.com/iomekam/GTSafe

Conflicts:
	GTSafe/.svn/wc.db
	GTSafe/bin/R.txt
	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$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$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/classes/com/google/android/gms/R$attr.class
	GTSafe/bin/classes/com/google/android/gms/R$color.class
	GTSafe/bin/classes/com/google/android/gms/R$drawable.class
	GTSafe/bin/classes/com/google/android/gms/R$id.class
	GTSafe/bin/classes/com/google/android/gms/R$integer.class
	GTSafe/bin/classes/com/google/android/gms/R$string.class
	GTSafe/gen/com/example/gtsafe/R.java
	GTSafe/gen/com/google/android/gms/R.java