Merge branch 'Ads'
faster ad_after fade in
Merge branch 'master' into Ads