Change activity with JSP
Pre-rebase commit
Rebase