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
MP-460: restore more deleted settings
POR-129 POR-127 POR-126

Add data_gaps.description, data_gap.description, make event.description rich
first step in resolving POR-136: redirect homepage to a random ocean story
POR-143 remove search form for prototype
remove /media -> /static redirect, now that data_manager fixture has been updated
Use OSM base layer constructor instead of MapQuest
log -> info
disable hiding data layers during transition animation, for now
tidy up templates, pulling common functionality into cms_base.html
navbar organization, add logo, set collapse breakpoint wider
add default body class "classless-page"
add eponymous <header> tag around block
kill the wagtailuserbar. kill it dead!
use bootstrap.js from bower_components, for now
add features to apps, to avoid startup error