Merge for playlist feature

Read the descriptions of the commits!