fixing devise login form
Merge branch
Merge branch