merged changes from Lynn's branch (h-f.js, h-f.jsp, site.css) to DEV