Allow using django CMS with custom admin site
Updated docs

I added a warning about returning non-utf8-encoded strings from within ``def __unicode__()``, as I found it resulting in a 500 response and a plugin instance marked as <Empty>. After returning as UTF8 everything worked as expected. If you can't confirm these issues to be related or feel that the addition doesn't make sense for documentation readers, feel free to drop it.
Make cms.test_utils.utils.static_analysis usable outside the CMS test suite
Merge pull request #3370 from yakky/feature/generic_static_analysis

Make cms.test_utils.utils.static_analysis usable outside the CMS test su...
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
Merge pull request #3363 from sthzg/patch-2

Updated docs
Merge remote-tracking branch 'origin/feature/python_2_unicode_compatible' into feature/python_2_unicode_compatible

Conflicts:
	cms/models/placeholdermodel.py
	cms/models/pluginmodel.py