fixes #218 and fixes #226
fixes issue #217
Merge pull request #230 from Catrobat/issue#217

fixes issue #217
Merge pull request #228 from Catrobat/issue#218

fixes #218 and fixes #226
Merge branch 'master' into ide_refactoring

* 'master' of gh:Catrobat/Catty:
  fixes issue #217
  fixes #218 and fixes #226

Conflicts:
	src/Catty.xcodeproj/project.pbxproj