Refactor Sound Brick XMLs
Merge branch 'master' into SoundBrickXML_Michi
Merge branch 'master' into SoundBrickXML_Michi
rename the testview in the code
small changes
Refactored Look Brick XMLs

Added style definitions for Look Bricks to styles.xml and applied them
to all Look Bricks. Also changed some ids, therefore some java files
needed to be modified.
fix MoveBrickAcrossScriptTest

index refactoring because of change of brick heights
Merge branch 'master' into SoundBrickXML_Michi
fixed longClickAndDrag test

brick were moved to wrong position because it were put exactly on the
other
added small offset
Merge pull request #104 from Catrobat/issue#98

Finished SoundActivity according to design mockup
Merge branch 'master' into SoundBrickXML_Michi
Fix Sound Brick layouts
Refactored Look Brick XMLs

Added style definitions for Look Bricks to styles.xml and applied them
to all Look Bricks. Also changed some ids, therefore some java files
needed to be modified.
fix MoveBrickAcrossScriptTest

index refactoring because of change of brick heights
fixed longClickAndDrag test

brick were moved to wrong position because it were put exactly on the
other
added small offset
Merge branch 'RefactorLookBrickXMLs' of github.com:Catrobat/Catroid into RefactorLookBrickXMLs

Conflicts:
	catroid/src/org/catrobat/catroid/content/bricks/ChangeBrightnessByNBrick.java
Merge pull request #157 from Catrobat/SoundBrickXML_Michi

Successful testrun http://catrobatgw.ist.tugraz.at:8080/job/Catroid-custom-branch-test/218/
redid issue #30 fix
Modify Keep Screen On code in Stage

* Use addFlags() instead of setFlags()
* Remove hardcoded int in tests

Tested on device with 15s screen timeout. Works.
Fix SimpleStageTest

* Remove goBackToHome() because nothing exists besides the
  StageActivity
* Remove assert that was just there to trick the SourceTest