refactored workshop java
Merge branch 'master' of https://github.com/ramuenugurthi/crm-master

Conflicts:
	crm-commons/src/main/java/com/knowledgehut/crm/entities/WorkShop.java