account settings and base templates changes
Merge branch 'master' of https://github.com/jobinrefer/dev.git