added devise with optional email
Merge branch 'devise_user'