Merge "Make TOC hideable"

diff --cc includes/OutputPage.php
Simple merge

diff --cc includes/parser/Parser.php
Simple merge

diff --cc tests/parser/parserTest.inc
Simple merge

diff --cc tests/parser/parserTests.txt
Simple merge

diff --cc tests/phpunit/includes/parser/NewParserTest.php
Simple merge