Merge pull request #39 from pkkup/master

user email update apis and templates