Fix email code
Merge branch 'master' of https://github.com/niaquinto/AdvisorTool
Add settings page w/ user management