new curved shapes, resizing text fields, small animation issue fixed
fixed boolean value in FE
Merge branch 'master' into issue#410

Conflicts:
	src/Catty/FormulaEditor/Views/FormulaEditorButton.m
Merge pull request #416 from Catrobat/issue#410

Issue#410
Merge pull request #417 from Catrobat/issue#395

major parser code update
FormulaEditor fixed userVar

distinguish between obj and program
outcomment unused tests
Merge pull request #418 from Catrobat/uservariable

FormulaEditor fixed userVar
Merge branch 'master' of github.com:Catrobat/Catty into issue#84

# By Marc Slavec (3) and Ralph Samer (1)
# Via Ralph Samer (3) and others
* 'master' of github.com:Catrobat/Catty:
  outcomment unused tests
  FormulaEditor fixed userVar
  fixed boolean value in FE
  new curved shapes, resizing text fields, small animation issue fixed

Conflicts:
	src/Catty/Defines/LanguageTranslationDefines.h
	src/CattyTests/Parser & Serialization/CatrobatLanguage0.93/XMLSerializerTests/BlackBox Tests/XMLSerializerBlackBoxTests.m