Restructure admin form javascript
Merge branch 'master' of gelbman:blop
Fix escape_html sub for "0"
Merge branch 'master' of gelbman:blop