SAVANT and Survey Database FIXED FINAL
Merge branch 'master' of https://github.com/mikedayupay03/SAVANT

Conflicts:
	bin/SAVANT.apk
	bin/classes.dex
	bin/classes/database/SavantDatabaseHandler.class
	bin/classes/database/SurveyDatabaseHandler.class
	bin/classes/objects/Site.class
	bin/jarlist.cache
	bin/resources.ap_