foot
hibernate
Merge remote-tracking branch 'origin/master'

Conflicts:
	OilManage/src/hibernate.cfg.xml