solution jsp page
Merge remote-tracking branch 'origin/solution' into merge-all