Merge git://github.com/stephenmcd/mezzanine
Fix handling of paths in zip imports in galleries app.
Norwegian translation string with < and > characters break page editing.
Added Kim Tore Jensen to AUTHORS.
Merge
accounts: properly reject multiple matching e-mail addresses.

Django allows multiple Users with the same e-mail address; the existing
form can throw MultipleObjectsReturned when get(email=email) is called
against such a dataset.
Added Mike Wakerly to AUTHORS.
Merge
Added default wsgi script to project template.
Only add input-xlarge on inputs without a class attribute, fixes #643
Replaced the BLOG_URLS_USE_DATE setting with a new BLOG_URLS_DATE_FORMAT setting - it can contain the string year, month, or day, which controls the date granularity in blog post URLs.
Editable settings refactor - this change is to clear up confusion around editable settings being defined in a project's settings module. Previously when this happened, the settings.py module value would only serve as a default, which would be superceded by the db editable value as soon as the settings admin form is first saved. To address this, this change means that editable settings defined in the project's settings.py module now mark the setting as not editable, so it will always be the value used. We also include some handling for the migration case so that even with this change, editable settings already in the db that have a settings.py value defined will still use the db value and provide a warning.
Revert the handling for still using db values for editable settings with settings.py values defined, since it basically defeats the purpose if a settings.py value is added once a project is live.
pep8 fix
Added INLINE_EDITING_ENABLED setting
New INLINE_EDITING_ENABLED setting doesn't need to be editable.
Added Jeff Fein-Worton to AUTHORS.
Merge branch 'master' of git://github.com/kenthauser/mezzanine
Merge git://github.com/stephenmcd/mezzanine