[finishes #80604360] worked on marked as listened to and finished playback from beginning or saved point
merged with master
fixed some merging stuff