made a little more progress on the database
Merge branch 'master' of https://github.com/bwash34/Brand-Ambassador.git

Conflicts:
	BrandAmbassador/bin/BrandAmbassador.apk
	BrandAmbassador/bin/classes.dex
	BrandAmbassador/bin/resources.ap_