Added support for HTML 5 input types
Update botched merge
Merge branch 'master' into gh-pages