Merge origin/master

Conflicts:
	CHDB/log/log1.dat
	CHDB/seg0/c150.dat
	CHDB/seg0/c161.dat
	CHDB/seg0/c171.dat
	CHDB/seg0/c20.dat
	CHDB/seg0/c230.dat
	CHDB/seg0/c31.dat
	CHDB/seg0/c41.dat
	CHDB/seg0/c490.dat
	CHDB/seg0/c4a1.dat
	CHDB/seg0/c4b0.dat
	CHDB/seg0/c4c1.dat
	CHDB/seg0/c4d1.dat
	CHDB/seg0/c4e1.dat
	CHDB/seg0/c4f0.dat
	CHDB/seg0/c501.dat
	CHDB/seg0/c51.dat
	CHDB/seg0/c560.dat
	CHDB/seg0/c580.dat
	CHDB/seg0/c591.dat
	CHDB/seg0/c5a1.dat
	CHDB/seg0/c5b1.dat
	CHDB/seg0/c5c1.dat
	CHDB/seg0/c60.dat
	CHDB/seg0/c71.dat
	CHDB/seg0/c81.dat
	CHDB/seg0/c90.dat
	CHDB/seg0/ca1.dat
	CHDB/seg0/cb1.dat
	CHDB/seg0/cf0.dat