moved /html folder into the /js folder so the view scripts could easily call the html templates.
Merged ronnie's code
Minor fixes
Merge branch 'ronn13-master'