Added WikipediaLinkStorage
changed self.item to self._item
WIP - use subpages for conflicts
Merge remote-tracking branch 'hazard/patch-1'