Fix a typo on the Content Architecture page
Made "flake8 ." output less warnings.

Excluded docs/conf.py as its autogenerated by Sphinx and increased
acceptable complexity from 10 to 20.
Separated generation of short_urls from their saving.
include menu pages in broader context. issue #1154
Added William Scales to AUTHORS.
Merge
Merge
Merge
Refactored confirmation prompts in createdb, create_pages and collecttemplates.
Abstracted out a content translation test case.
Fixed admin bases tests (first resolution order class is the given class).
Don't remove unused keywords to avoid losing their translations.
Merge branch 'master' into feature/modeltranslation-integration-1.7-dev

Conflicts:
	mezzanine/core/management/__init__.py
	mezzanine/core/models.py
Moved an import.