Modified gemfile.lock
Add account activation, password resets, & email configuration
Merge branch 'account-activation-password-resets'