resolve merge conflicts
Merge pull request #61 from worldintime/email_confirmation_design

Email confirmation design