Merge pull request #231 from patriot1burke/master

rename same classes/attributes
KEYCLOAK-286 Allow login with username or email. KEYCLOAK-287 Remove recover username as we now support login with email
Merge pull request #232 from stianst/master

KEYCLOAK-286 Allow login with username or email. KEYCLOAK-287 Remove recover username as we now support login with email
refactor token creation
Merge remote-tracking branch 'upstream/master'