premerge
Merge branch 'master' of https://github.com/lilisun/pentimento
fixed stroke gray bug, select stroke repaint bug