Add the format m3u #4
Merge remote-tracking branch 'origin/1.2'

Conflicts:
	bin/music-playlist-generator.phar