Sound && music && themes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	AndroidManifest.xml
	res/layout/fragment_setting.xml
	res/values-v11/themes.xml
	res/values/attrs.xml
	res/values/colors.xml
	res/values/style.xml
	res/values/themes.xml
Sound && music && themes