Final changes for 7beta2.
Final changes for 7beta2.

artemnikitin/SeriesGuide,r00t-user/SeriesGuide,UweTrottmann/SeriesGuide,0359xiaodong/SeriesGuide,epiphany27/SeriesGuide,UweTrottmann/SeriesGuide,hoanganhx86/SeriesGuide