Merge branch 'master' into petrovic/brush-presets-cleanup

refreshed set of presets and some brush tips.

-- this still needs some work, but we will be doing future work in master instead of this branch for testers
-- In addition to presets, brush tips, and patterns, tags still need to be added

CCMAIL:kimageshop@kde.org