Merge branch 'master' into P11.01_straight_line
Merge branch 'P9.01_straight_line' of github.com:Catrobat/Paintroid into P11.01_straight_line