replace login.html with login.xhtml
replace login.html with login.xhtml
Merge remote-tracking branch 'origin/master'
update idea config files