generated template and Loginpage, welcome-page is now index.xhtml
lang-files work now
fixed language problem;
fixed merge