重装同步

Signed-off-by: lili <lili@kdanmobile.com>
Merge branch 'master' of github.com:lilizing/Dash

Signed-off-by: lili <lili@kdanmobile.com>

Conflicts:
	library.dash