Merge branch 'dev' into backup

author paladz <453256728@qq.com>

Thu, 19 Apr 2018 04:27:00 +0000 (12:27 +0800)

committer paladz <453256728@qq.com>

Thu, 19 Apr 2018 04:27:00 +0000 (12:27 +0800)
author paladz <453256728@qq.com>
Thu, 19 Apr 2018 04:27:00 +0000 (12:27 +0800)
committer paladz <453256728@qq.com>
Thu, 19 Apr 2018 04:27:00 +0000 (12:27 +0800)
diff --cc api/accounts.go
Simple merge
diff --cc asset/asset.go
Simple merge
author	paladz <453256728@qq.com>
	Thu, 19 Apr 2018 04:27:00 +0000 (12:27 +0800)
committer	paladz <453256728@qq.com>
	Thu, 19 Apr 2018 04:27:00 +0000 (12:27 +0800)
		1	2
api/accounts.go	patch \|	diff1 \|	diff2 \|	blob \| history
asset/asset.go	patch \|	diff1 \|	diff2 \|	blob \| history