fixes #261
Merge pull request #310 from Catrobat/issue261

fixes #261
Merge branch 'master' of gh:Catrobat/Catty into issue305

* 'master' of gh:Catrobat/Catty:
  fixes #261

Conflicts:
	src/Catty/FileManager.m