Merge pull request #2998 from mmarzantowicz/develop

Fixed: Error importing module cms.middleware.toolbar: "cannot import name plugin_pool"
data migraton
docs and syntax change
locales updated
locales updated
Merge pull request #3000 from digi604/fix-2999

Fix 2999
prevent site collisions
Merge branch 'develop' of github.com:divio/django-cms into develop
locales updated
bumps version to 3.0c2.dev3