Fix equality condition on a lazy object.
Add missing trans on plugin edit tooltip
Decode plugin name entities in edit tooltip
Fix tests urlconfs
Reload urls in ApphooksPageLanguageUrlTestCase
Remove commented TODO
Merge pull request #2328 from ollb/plugin_edit_tooltip_untranslated

Add missing trans on plugin edit tooltip
Merge pull request #2327 from ollb/issue_lazy_request

Fix equality condition on a lazy object.
Merge pull request #2330 from yakky/feature/fix_apphook_test

Fix random test failures
also bind escape key
set dropdown to top when reaching bottom bound
Merge pull request #2329 from ollb/plugin_edit_tooltip_entities

Decode plugin name entities in edit tooltip
Merge branch 'develop' of github.com:divio/django-cms into develop

Conflicts:
	cms/static/cms/js/plugins/cms.placeholders.js