Updating edit client.
Merge branch 'master' of https://github.com/preetigupta2000/tm.git

Conflicts:
	grails-app/views/templates/client-list-row.gsp
	web-app/js/libs/templateManager.js
Resolving conflicts.