Committing before sumit's changes
Merge branch 'finalbranch' of https://github.com/RaazTripathi/ProjInv into finalbranch

Conflicts:
	src/com/tss/ocean/controller/JournalController.java
	src/com/tss/ocean/pojo/Journal.hbm.xml
	src/com/tss/ocean/pojo/Journal.java