toolbar refactor for populate and fixes admin tree menus
fixes #2143
update en locale
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