update db urls and add access permission for android
Merge pull request #210 from futuresandwich/bug/android_url_settings

update db urls and add access permission for android
Merge branch 'upstream-develop' into feature/stockout-broadcast-confirm

Conflicts:
	app/manifest.json