Inserting receipt generation completed
Merge branch 'master' of https://github.com/teamM/Kadam.git

Conflicts:
	Kadam/src/com/kadam/controller/ReceiptGenerationController.java
	Kadam/src/com/kadam/dao/impl/ReceiptgenerationDAO.java