finished add user, added email template
fixed merge conflicts