changes to jsp files
Merge branch 'master' of https://github.com/multitech/iRIS