commit before sumit's update
Merge branch 'finalbranch' of https://github.com/RaazTripathi/ProjInv into finalbranch
commit before updating from sumits changes
Merge branch 'finalbranch' of https://github.com/RaazTripathi/ProjInv into finalbranch

Conflicts:
	build/classes/com/tss/ocean/controller/EmployeeController.class
	build/classes/com/tss/ocean/controller/JournalController.class
	build/classes/com/tss/ocean/pojo/Journal.class
	build/classes/com/tss/ocean/pojo/journal.hbm.xml
	build/classes/hibernate.cfg.xml
	build/classes/messages_en.properties