devise config
Merge branch 'devise_config' into develop