Add very basic Devise User. Login/logout.
Resolve merge conflicts