workshop search also added.
Merge branch 'master' of https://github.com/ramuenugurthi/crm-master

Conflicts:
	crm-web/src/main/java/com/knowledgehut/crm/service/WorkshopService.java
	crm-web/src/main/java/com/knowledgehut/crm/util/ConvertUtil.java