update preview
update preview
Merge branch 'master' of github.com:vipworld/scrapbook

Conflicts:
	build/scrapbook/panel/rules.js
	src/scrapbook/panel/rules.ms