merge client js, update form to accomodate, move js include into main la...

...yout

fixes issue #11