use email to login
Merge pull request #69 from michaelfung/master

use email to login