Merge branch 'master' into foodcoop-adam-beta

Conflicts:
	Gemfile.lock
Merge branch 'feature-shareddb_ui_cleanup' into HEAD
remove senseless "restrict to region only" checkbox