3.12.20 part2
Merge branch 'master' of https://github.com/ingbrzy/ma-xml-5.0-FRENCH

Conflicts:
	French/main/Music.apk/res/values-fr/strings.xml