Merge pull request #9 from point97/marine_planner

Marine planner
Merge pull request #10 from point97/marine_planner

Fixing a typo (missing comma) in the bower.json file
implement parsing for MP urls in ocean story map state field
handle map_state parse exception on output with a default value
handle missing story sections in story map
handle unknown basemap in map_state

use current or default
background color for map, so page body doesn't show through
Merge pull request #8 from point97/parse_mp_urls

implement parsing for MP urls in ocean story map state field
reorganize settings so it's not necessary to set DJANGO_SETTINGS_MODULE in production
add missing import .local
fix locale code
Merge pull request #12 from point97/reorganize_settings

reorganize settings to use one module with an optional local module
remove accidentally included social auth backends
move dev db settings to dev module
fix email backend for prod
Merge branch 'reorganize_settings'
fix env in wsgi.py
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