fixed dialog issue
Merge remote branch 'origin/master'

Conflicts:
	crm-web/src/main/java/com/knowledgehut/crm/view/LazyWorkShopBeanModel.java