merge
Merge branch 'master' of github.com:mycart/PaintPanel
fix debug