Merge pull request #40 from pkkup/master

adding account settings and emails form templates