Config Devise
Merge branch 'dev'