database updates
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	BrandAmbassador/bin/BrandAmbassador.apk
	BrandAmbassador/bin/classes.dex
	BrandAmbassador/bin/classes/com/example/brandambassador/AddEventActivity$1.class
	BrandAmbassador/bin/classes/com/example/brandambassador/AddEventActivity$2.class
	BrandAmbassador/bin/classes/com/example/brandambassador/AddEventActivity$3.class
	BrandAmbassador/bin/classes/com/example/brandambassador/AddEventActivity$4.class
	BrandAmbassador/bin/classes/com/example/brandambassador/AddEventActivity.class
	BrandAmbassador/bin/classes/com/example/brandambassador/R$id.class
	BrandAmbassador/bin/classes/com/example/brandambassador/R$layout.class
	BrandAmbassador/bin/classes/com/example/brandambassador/R$menu.class
	BrandAmbassador/bin/classes/com/example/brandambassador/R$string.class
	BrandAmbassador/bin/classes/com/example/brandambassador/R$style.class
	BrandAmbassador/bin/dexedLibs/android-support-v4-bd009f3b429e5b7c4a93993576cd3996.jar
	BrandAmbassador/bin/dexedLibs/dropbox-sync-sdk-android-a0b833db522e7bc147a0bc6f714a14ac.jar
	BrandAmbassador/bin/dexedLibs/jxl-58da6a264fd75a64db80ed5dc003ee86.jar
	BrandAmbassador/bin/resources.ap_
	BrandAmbassador/gen/com/example/brandambassador/R.java
	BrandAmbassador/src/com/example/brandambassador/AddEventActivity.java