Add all player enhancements
Merge branch 'player-enhancements-2' into development
Comment lines of timeout
Merge branch 'player-enhancements-2' into development
Hot fix for notifications and playlists