Allow using django CMS with custom admin site
Merge remote-tracking branch 'origin/develop' into custom-admin-namespace

Conflicts:
	cms/templates/cms/toolbar/plugin.html
strip if you don't want newlines at the end of files
support ancient snakes
Merge pull request #3354 from ojii/custom-admin-namespace

Allow using django CMS with custom admin site