Change in HTML site creation.
merge test
Add html-template and make-html-form-fn parameters to with-web-calc