Email Templete CRUD operations
Merge branch 'master' of https://github.com/Innostark/MTMS

Conflicts:
	emailtemplating.web/Scripts/app/AddMergeVarMap.js