fixes #326
fixes #316
reenable delete program button in edit menu of ProgramTVC
Merge pull request #339 from Catrobat/issue#326

fixes #326
Merge pull request #340 from Catrobat/issue#316

fixes #316
Merge branch 'master' into issue#287

Conflicts:
	src/Catty/ProgramTableViewController.m
	src/Catty/iPhone.storyboard