Explictly set the User.per_page to 10 instead of the default
will_paginate value(30)
Use a non fucked up Faker version
Update gems
Merge branch 'master' into reset_password_mailview
Complete reset password feature

I had to tweak a little bit devise password controller in order to
display a custom page upon successful password change