Add For Audio
Merge branch 'master' of https://github.com/2014-1/001

Conflicts:
	MainProject/AndroidManifest.xml
Fix for conflict
add audio list test data
Merge branch 'master' of https://github.com/2014-1/001

Conflicts:
	MainProject/AndroidManifest.xml
	MainProject/res/values/strings.xml
Merge branch 'master' of https://github.com/2014-1/001

Conflicts:
	MainProject/AndroidManifest.xml
	MainProject/res/values/strings.xml