try
Merge branch 'newfolderstructure' of github.com:Catrobat/Catroid into newfolderstructure
emulatorWarnings fixed.
- solo.searchText replaced to solo.waitForText
broadcastBricksTest #1
MainMenuActivityTest fixed.
errors fixed. (similar problems)
Merge branch 'newfolderstructureEmulator' into newfolderstructure

Conflicts:
	catroid/src/androidTest/java/org/catrobat/catroid/uitest/ui/activity/MyProjectsActivityTest.java