Commit Suraj Changes

Commit SurajChanges
Merge remote-tracking branch 'origin/master'

Conflicts:
	ClassDatabase/src/main/resources/hibernate.cfg.xml