Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionOperation

# Conflicts:
#	public/web/rpt_value_define.js
#	web/maintain/report/js/rpt_tpl_calculation.js