Minor fixes
Merge remote-tracking branch 'origin/nkbranch' into abbranch
Merge remote-tracking branch 'origin/abbranch' into nkbranch
Merge remote-tracking branch 'origin/abbranch' into nkbranch
Merge with abbranch and fix
Merge branch 'nkbranch' of https://github.com/normantaskudzma/paintapi into abbranch
add color picker