Refactoring
Login refactoring and faces servlet fix