commit for avoiding merge error
commit for avoiding merge error
spec for devise_error_simple_message
DeviseHelper was refactored