Updated loginpageservlet
Merge branch 'master' into ET-dev