Update devise to 3.1.1, and remove token_authenticatable module
Merge pull request #581 from arthurnn/devise_update

Update devise to 3.1.1, and remove token_authenticatable module
Base configuration
Base configuration
Merge remote-tracking branch 'upstream/master'
Base configuration