update
Merge branch 'master' of https://github.com/juri775/androed.git

Conflicts:
	xml_2_m3u