add files to master
remove <code> markup of index.html
format change
format JSonForm.scala
add script invocation before submit form
fix conflicts