more JSP edits
add files
Merge origin/master