Moved all file handling to FeedManager
Merge remote-tracking branch 'origin/marcus-0.7.3' into marcus-073-merge-with-rodrigo-master