ok
ok
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	zhwh/src/daemon/zhwh.conf
	zhwh/src/daemon/zhwh_sp.py
	zhwh/src/data/zhwh.sql
ok
ok
ok
ok
ok