added Playlist and Track classes for server
fixed merge conflict