Sound tests and assets
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidBasicsStarter/src/main/AndroidManifest.xml
Sound tests and assets