Merge pull request #3 from boda2004/master

master
WIP: User: implemented associated emails functionality