Change error definition
Solve bugs in master
resolve coonflict
Merge branch 'lhh_dev'

Conflicts:
	client/const.go