music is ok.
Merge branch 'master' of https://github.com/app4women/soul.git

Conflicts:
	res/values/strings.xml