Merge branch 'develop' of github.com:divio/django-cms into develop
Merge branch 'develop' into fix-call-template
Merge pull request #2630 from digi604/fix-call-template

Fix call template
fixes #2417
catch template syntax errors when templatetags are not found yet
Merge pull request #2634 from digi604/fix-2417

fixes #2417 (publish in language that is not in CMS_LANGUAGE)
fixes issue #2599 and #2540
fixed some calculation errors
Merge pull request #2635 from FinalAngel/develop

modal size issues
fixes a positioning issue when resizinh or dragging the modal
bumps version to 3.0b4.dev7
fixes issue “2464
create outer bound for the sideframe, fixes #2459
Update menu.py
setup select2
fix drag&drop
Merge pull request #2637 from digi604/fix-dd

fix drag&drop
Merge pull request #2632 from belegnar/patch-1

Update menu_tags.py
Merge pull request #2636 from belegnar/patch-2

Update menu.py
add restriction when sideframe is larger than window on refresh, fixes #2458