fixes #271
Merge branch 'master' into issue271

Conflicts:
	src/Catty/CatrobatProject.m
	src/Catty/CreateView.m
Merge pull request #345 from Catrobat/issue271

Issue271