backout aa850efe2315
backout eff95dec6799
Merge branch 'master' into feature/modeltranslation-integration

Conflicts:
	mezzanine/pages/models.py
Moved the MEDIA_LIBRARY_PER_SITE setting from filebrowser_safe into Mezzanine so it's documented. It allows per-site filebrowser root directories.
Bump filebrowser/grappelli versions.
Bump version to 1.4.0
Added tag 1.4.0 for changeset 90e95e46b33a
Update automated changelog, settings docs, model graphs, requirements.
Remove unnecessary permission from live_settings module. Closes #568.
Merge branch 'master' into feature/modeltranslation-integration

Conflicts:
	mezzanine/pages/models.py
Merge branch 'feature/modeltranslation-integration' into develop

Conflicts:
	mezzanine/pages/models.py