Added NewsFeedXmlParser
Removed conflicted files