changed attribute names in several form elements
Merge branch 'master' into gh-pages