Merge remote-tracking branch 'origin/nkbranch' into abbranch
Merge branch 'nkbranch' of https://github.com/normantaskudzma/paintapi into abbranch
add color picker
Minor code cleanup, custom cursor bugfixes