MP-460: Settings for features / bookmarks / sharing
Merge branch 'master' of github.com:point97/marco-portal2

Conflicts:
	marco_config/settings/base.py
MP-460 Restore changes from git's terrible auto merge