fix some checkstyle errors
Merge pull request #867 from Catrobat/fixCheckstyleErrors

fix current checkstyle errors
Merge branch 'master' into bt_refactored_testing

Conflicts:
	catroidTest/src/org/catrobat/catroid/uitest/util/UiTestUtils.java