Support episodic DVDs (Fix #1)
Fix recently watched for episodic DVDs (Fix #3)
Fix merge conflicts