FIX Double slashes in ParameterConfirmationToken
BUG: Context menu too long - CSS only (Fixes CMS #811)
Update jQuery Entwine to latest to pull memory leak fix
FIX Two memory leaks with HtmlEditorField

We werent calling tinyMCE.Editor.destroy, which is needed to
clean up event bindings. The advanced theme also wasnt cleaning
up after itself on destroy properly
FIX Make sure CurrentXHR is set back to null on completion
FIX Memory leaks in jstree drag & drop
Merge branch 'context-menu' of https://github.com/adrexia/framework into adrexia-context-menu

Conflicts:
	admin/scss/_tree.scss
Updated entwine dependency

And removed unnecessary files, just adds
to the security surface of the webroot.
Merge pull request #2336 from hafriedlander/fix/flush_30

FIX Double slashes in ParameterConfirmationToken
Merge pull request #2335 from evjan/3.1

Corrected parameters in model relations example
Merge pull request #2314 from mateusz/required-attrs

HTML5 required attributes on default fields, add validator to the login form
Fixed "insert image" behat feature

Was using wrong button label, and ignoring the
"unsaved changes" warning dialog
Merge pull request #2340 from hafriedlander/fix/memleaks

Fix some memory leaks in 3.1.0 admin
Merge branch '3.1.0' into 3.1

Conflicts:
	thirdparty/jquery-entwine/dist/jquery.concrete-dist.js
	thirdparty/jquery-entwine/spec/SpecRunner.html
	thirdparty/jquery-entwine/spec/spec.entwine.eventcapture.js
	thirdparty/jquery-entwine/spec/spec.entwine.namespaces.js
	thirdparty/jquery-entwine/src/domevents/jquery.entwine.domevents.addrem.js
	thirdparty/jquery-entwine/src/jquery.entwine.eventcapture.js
	thirdparty/jquery-entwine/src/jquery.entwine.js
	thirdparty/jquery-entwine/src/jquery.focusinout.js
Merge remote-tracking branch 'origin/3.0' into 3.1.0

Conflicts:
	docs/en/changelogs/index.md
Merge remote-tracking branch 'origin/3.1.0' into 3.1
Returning 404 on /Security, instead of Controller.ss template

We shouldn't expose unsolicited content on public URLs,
mainly because it impacts SEO.
Merge pull request #2294 from wilr/fixgridexport

FIX: Remove limit on GridField export
FIX Multiple redraw calls on navigation
FIX Dont update preview iframe if hidden

Updating the iframe src when the iframe isnt visible in IE8 causes a
view disconcerting font glitch (and it slows down navigation anyway),
so if the iframe isnt visible, delay setting the src until it is