added form and label layout
Merge remote-tracking branch 'jekyll-template/master' into gh-pages