merge fxa migration in user.js for now to solve dependency issues
Merge pull request #694 from ngokevin/fxamig

merge fxa migration in login.js for now to solve dependency issues