changes in jsp on UI
Merge branch 'ppils' into peda