Bug 937096 - The ringtone name does not appear in sounds settings.
ringtone_test_fixed
Merge branch 'ringtone_test' of git://github.com/borjasalguero/gaia into borjasalguero-ringtone_test

Conflicts:
	apps/communications/ftu/test/unit/ringtone_customizer_test.js