Merge branch 'master' of https://github.com/XSilent/jsPaint.git