Update master
In addition to #1722. expire_auth_token_on_timeout added to Timeoutable configuration block.
Merge pull request #1896 from Antiarchitect/patch-1

In addition to #1722. expire_auth_token_on_timeout added to Timeoutable configuration block.
Merge pull request #1892 from clody69/master

Fixed User model generation for Mongoid
Update README.md, closes #1895
Better error message when mapping can't be found
Fix rdoc rake task [ci skip]
Redirect to sign in page when trying to access password#edit without a
reset_password_token (i.e. not coming from a reset password email)
Merge branches 'master' and 'no_token'
Merge pull request #1902 from gbataille/master

Redirect to sign_in page when trying to access password#edit without a reset password token
Adding option to change omniauth path prefix
Merge pull request #1903 from zamith/master

Routes for engines
Add more docs, remove 3.0 related code, update CHANGELOG
Persist unlock token before triggering mailer
Merge pull request #1908 from mhfs/lockable_async_fix

Persist unlock token before triggering mailer
Depend on latest orm adapter
use data-confirm option as :confirm was deprecated in rails 3.2.6
Merge pull request #1920 from nashby/data-confirm

use data-confirm option as :confirm was deprecated in rails 3.2.6
use data-confirm option as :confirm was deprecated in rails 3.2.6

SimpleForm templates
Merge pull request #1921 from nashby/data-confirm

use data-confirm option as :confirm was deprecated in rails 3.2.6