before mehanna's meeting
Merge branch 'finalbranch' of https://github.com/RaazTripathi/ProjInv into finalbranch
commit for sumit
my commit to sumit
Merge branch 'finalbranch' of https://github.com/RaazTripathi/ProjInv into finalbranch

Conflicts:
	WebContent/WEB-INF/jsp/debitandcredit.jsp
Merge branch 'finalbranch' of https://github.com/RaazTripathi/ProjInv into finalbranch
commit
Merge branch 'finalbranch' of https://github.com/RaazTripathi/ProjInv into finalbranch

Conflicts:
	src/hibernate.cfg.xml
	src/log4j.properties
Committed with sumit changes