test + implementation + cleanup
Merge branch 'master' into I133_cursortoolcolor_not_switched
Merge pull request #135 from Catrobat/I133_cursortoolcolor_not_switched

I133 cursortoolcolor not switched
@Implementation:  @landliebe [ML]
@Acceptance: @galstc05 [SG]