[Upg] enable login with email or username
Merge branch '1.1' into 1.2
Merge branch '1.2'