resolve conflicts
Merge branch 'master' of https://github.com/jadobi/tv-show-observer.git
episode view layout added
EpisodeDetailView added
renaming EpisodeView in Upcoming...