Refactored confirmation prompts in createdb, create_pages and collecttemplates.
Factored out deleting unused keywords as a manager method.
Fixed a typo in utils/conf.py.
Allowed optional apps to be loaded for testing.
Removed django_extensions from INSTALLED_APPS for testing.
Use the response context during two-phase rendering

If a response has `context_data` use that instead of creating a new
context and running context processors again.
Merge
Fix for using response context_data
Merge
Merge
Remove call to set_model_permissions in page admin
Fixed core.test_password_reset with i18n_patterns.
Fixed pages.test_login_required with I18N / LocaleMiddleware.
Backout context processor changes to cache middleware for now, re #1174.
Merge
Merge
Merge remote-tracking branch 'upstream/master'