JSP fixes
Merge branch 'master' of https://github.com/Fruzenshtein/spr-data