Merge branch 'develop' into placeholder_plugin
fixed merge error
removed unused line
PlaceholderRef should have a language
Merge branch 'placeholder_plugin' of github.com:digi604/django-cms into feature/clipboard
seams to break tests... no clue why
fixed a small issue with submenu key controls
add delete on cancel again
added tests
removed unused class
Merge pull request #2376 from digi604/placeholder_plugin

WIP Placeholder plugin
Merge pull request #2387 from FinalAngel/feature/clipboard

Proper Cut & Paste
fixed tests
updated locales
emergency fix for jstree
locales updated
Merge pull request #2390 from FinalAngel/fixes

emergency fix for jstree
removed unused code
added pickel test and removed unused code
fixed version