resolving conflict.
Merge branch 'master' of https://github.com/prabodhak/credit-society.git

Conflicts:
	src/main/webapp/WEB-INF/jsp/common/crud-menu.jsp
updated crud-menu.jsp