added password reset, mandrill templates for fileupload and welcome, fixed password overrides
pushing to gh