unwatched-count
Merge remote-tracking branch 'origin/UnwatchedCount' into UnwatchedCount

Conflicts:
	serenity-app/res/drawable/episode_count_background.xml
Merge remote-tracking branch 'origin/UnwatchedCount' into UnwatchedCount

Conflicts:
	serenity-app/res/drawable/episode_count_background.xml