fixes #336
Merge branch 'issue#323' of gh:Catrobat/Catty into issue#323_done

* 'issue#323' of gh:Catrobat/Catty:
  storyboard merge fixes
  new icons
  fix for FeaturedStore Cell