Possible Quickfix for isssue #342
Merge branch 'master' into issue#342
Merge branch 'master' into issue#342
Adding of testcase and refactoring.
Rename of testcase
Merge branch 'master' into issue#342
Merge branch 'master' into issue#342
Resolve of merge conflicts
Merge pull request #399 from Catrobat/issue#342

fixed #269, fixed #342
reviewed by @sjaindl, @felly