commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	OilManage/WebRoot/js/project.js
	OilManage/WebRoot/pages/simulate_hydraulic.jsp