Merge branch 'develop' of github.com:divio/django-cms into develop
fixed a bug with publishing and mptt conflicts
revert
locales
fixes a plugin ordering problem
fixes #1989
Merge pull request #1992 from digi604/fix-1989

fixes #1989
Make djangocms-admin-style required
Merge pull request #1994 from yakky/feature/admin_style

Make djangocms-admin-style required
fixes #2004
Merge branch 'develop' of github.com:divio/django-cms into develop
stack docs
Merge pull request #2007 from digi604/stack-docs

stack docs
Fixes #1967
fixxes issue #1997
fixes positioning issues with django admin
fixes issue #1982
fixes an issue with the content/structure visibility when there is no placeholder. Fixes also an issue with the new positioned publish button.
Merge pull request #2009 from FinalAngel/develop

Various frontend related fixes
fixes #1932. removed twitter plugin.
new twitter pluginr reference