Added some validation for user
Merged conflict
did stuff
changed ActionMailer email, precompiled assets and merged