MODIFIED: login.xhtml in english , template with welcome message
Merge origin/develop into develop