FIXED: copy/paste errors in HTML form pages
Merge branch 'master' into Dataset-Support