jsp and js files
Merge branch 'origin/master'