check for duplicate username and/or email
resend confirmation instructions
refactor of forms to reuse code
some cleaning
fix conflicts
password
fix merge organizations