login with both email or username
Merge branch 'feature/login_with_username'