FIX: Don't fully rebuild form in extension - breaks FormField actions (fixes #1)
Minor: Update entwine logic to match newer framework logic
Merge branch 'master' of github.com:kinglozzer/htmleditoriframe

Conflicts:
	code/HtmlEditorField_Iframe.php