fixed database access
Merge remote-tracking branch 'origin/master'

Conflicts:
	FamilyShopper/src/main/res/layout/activity_settings.xml