update Playlist function (add,load,edit)
merge localbranch and master