FIXED STUFF

app works again, still missing actionbarsherlock.apk
Merge branch 'master' of https://github.com/robsmall/HubbaHubbaApplication

Conflicts:
	HubbaHubbaNew/bin/HubbaHubba.apk
	HubbaHubbaNew/bin/classes.dex
	HubbaHubbaNew/bin/classes/com/android/hubbahubba/AddLocation$1.class
	HubbaHubbaNew/bin/classes/com/android/hubbahubba/AddLocation$2.class
	HubbaHubbaNew/bin/classes/com/android/hubbahubba/AddLocation$3.class
	HubbaHubbaNew/bin/classes/com/android/hubbahubba/ViewMap$2.class
	HubbaHubbaNew/bin/classes/com/android/hubbahubba/ViewMap$3.class
	HubbaHubbaNew/bin/classes/com/android/hubbahubba/ViewMap$4.class
	HubbaHubbaNew/bin/classes/com/android/hubbahubba/ViewMap.class

HubbaHubbaNew/bin/dexedLibs/actionbarsherlock-d0322dffc6a43ff922f38adb9b
ce26cd.jar

HubbaHubbaNew/bin/dexedLibs/google-play-services_lib-e72a2cccd9fe734b23c
f6cfef24b5ad7.jar
	HubbaHubbaNew/bin/resources.ap_
	HubbaHubbaNew/src/com/android/hubbahubba/AddLocation.java
	HubbaHubbaNew/src/com/android/hubbahubba/ViewMap.java
	library/bin/actionbarsherlock.jar