Paint 60 import

Careful with merging, we need to revert the revert-commit.

Tests: https://jenkins.catrob.at/view/All-Categories/view/Paintroid/job/Paintroid-custom-branch-test/1039/

Additional mock tests to be added later.