Settings Activity. Background music.
Settings Activity. Background music.
Settings Activity. Background music.
Merge remote-tracking branch 'origin/master'

Conflicts:
	XO.iml
	XO/src/main/AndroidManifest.xml
	XO/src/main/java/com/mobilez365/xo/activity/MainActivity.java
	XO/src/main/res/values/strings.xml
	XO_Android.iml
Settings Activity. Background music.