Revert "Revert "Merge branch 'PAINT-60_Import' of https://github.com/Catrobat/Paintroid""

This reverts commit 125502c432336adfdf26a4d5753c7302fda5f17c.