fixes #72 and #136
Merge remote-tracking branch 'origin/development' into development
remove image borders
fix compile warning
Merge branch 'development' of gh:Catrobat/Catty into development

* 'development' of gh:Catrobat/Catty:
  remove image borders
  fixes #72 and #136