Fixed merge glitch in start
Merge pull request #204 from spark/feature/major-content-reorg

Fixed merge glitch in start