resources merge
merge complete
add IfBrickTest
style fix
LineEndings + SpriteName
brick tests fixed
merge artifacts fixed
TextCursorDrawTest added
Update catroid/.settings/org.eclipse.core.resources.prefs
fix lineendings
fix messed up textview
adapt license header
fix string tests

* remove unused strings
* translate if-then-else brick strings
fix failing SourceTests

* add missing license headers
* add missing errormessages in assert
* fix IfBrickTest.java
format xml files
fix german string
add correct keyboard background
Existing UserVariable handling + tests
Refactor InternFormula
fix StorageHandlerTest