Removed erroneous '</h:form>'
Merge remote-tracking branch 'remotes/origin/web-improvements'
Merge branch 'master' into experimental