update en locale
Merge branch 'develop' of github.com:divio/django-cms into develop
fixes the template validation if render_template is a callable
Merge branch 'develop' of github.com:divio/django-cms into develop
check property
Update menu_tags.py

Parent is nulled for menu nodes, this isn't very comfortable in some situations
Merge pull request #2627 from digi604/fix-2479

toolbar refactor for populate and fixes admin tree menus
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