modified names for inputs/ removed form attribute from text area
Merge branch 'master' into gh-pages