username field instead of email
Merge branch 'master' of https://github.com/irqlevel/scaleapp