Added missing spaces in deprecation warning.
Merge pull request #2727 from timgraham/missing_spaces

Added missing spaces in deprecation warning.
Merge branch 'develop' into fix-2514
Merge branch 'develop' into fix-2514

Conflicts:
	cms/tests/toolbar.py
Attempting to remove circular import
Removed dependencies that produced circular imports
Copied out part of the compat code to eliminate circular import
merging main develop branch to test
Merge pull request #5 from daegun/test

merging main develop branch
reverting temp import module change
adding tests
Add warning for plugin-renaming in the shell
Merge pull request #2721 from FinalAngel/develop

minor improvements
test cleanup
force unicode
Merge pull request #2733 from yakky/feature/plugin_renaming_warning

Add warning for plugin-renaming in the shell
Merge pull request #2724 from yakky/feature/session_cache_tests

Use Cache backend session only for tests
fix no i18n
force unicode 2nd
fixes some issues with copy pages