3.6/news data source

repeat merge after accidental nuking of ipad-news branch