JSP static presentation
Merge origin/master