Merge branch 'master' of http://192.168.1.12:3000/MaiXinRong/Measure

Conflicts:
	Dprs/Pro/Measure.dof
	Dprs/Pro/Measure_Cloud.dof
	Dprs/Pro/Measure_Cloud.dpr
	Dprs/Pro/Measure_GuangDong.dof
	Dprs/Pro/Measure_GuangDong_Cloud.dof
	Dprs/Pro/Measure_GuangDong_TZ.dof
	Dprs/Pro/Measure_TZ.dof
	Forms/MainFrm.dfm