cleanup and jsp addition
Merge branch 'master' of github.com:shankey/NemaJiGuptaJi