Add User to Devise Edit and New Registration view
Resolve 2 conflicts with friendfeed2 branch