#IAA-26 fixed work 5m
set welcome-file to login.jsp
Merge branch 'IAA-26' into development