changed link on featured articles to use wordpress function get_permalink
brought in topstories conflict conflict fix