CSProj files and remove merge leftovers
MERGE: TorrentCreator into Master