Fixed more merge conflicts with doc branch
Fixed more merge conflicts with doc branch

pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral,pioneers/PieCentral