Merge branch 'dev' into backup

author paladz <453256728@qq.com>

Wed, 18 Apr 2018 09:00:31 +0000 (17:00 +0800)

committer paladz <453256728@qq.com>

Wed, 18 Apr 2018 09:00:31 +0000 (17:00 +0800)
author paladz <453256728@qq.com>
Wed, 18 Apr 2018 09:00:31 +0000 (17:00 +0800)
committer paladz <453256728@qq.com>
Wed, 18 Apr 2018 09:00:31 +0000 (17:00 +0800)
diff --cc api/api.go
Simple merge
diff --cc asset/asset.go
Simple merge
author	paladz <453256728@qq.com>
	Wed, 18 Apr 2018 09:00:31 +0000 (17:00 +0800)
committer	paladz <453256728@qq.com>
	Wed, 18 Apr 2018 09:00:31 +0000 (17:00 +0800)
		1	2
api/api.go	patch \|	diff1 \|	diff2 \|	blob \| history
asset/asset.go	patch \|	diff1 \|	diff2 \|	blob \| history