Merge branch 'master' of https://github.com/unclebob/fitnesse.git
Merge branch 'master' of https://github.com/unclebob/fitnesse.git
Merge branch 'master' of https://github.com/unclebob/fitnesse.git
Merge branch 'master' of https://github.com/unclebob/fitnesse.git
Merge branch 'master' of https://github.com/unclebob/fitnesse.git
Merge branch 'master' of https://github.com/unclebob/fitnesse.git
file://// is ivalid in Windows :(
Resolved test failure in Windows.
Merge pull request #495 from sergebug/master

resolved various unit-test failures in Windows
Change color of includes in error
Improve rendering and tests
Fix code
Moved UpdateTestCase to tests.
No need to quote class path entries. Should address #498.
Merge pull request #496 from antoine-aumjaud/features/FIT-ChangeIncludePageColorInCaseOfError

Change error message rendering when included page doesn't exist
Fix IncludeTest: Expand/Collapse without All.
Merge branch 'master' into pagedata

Conflicts:
	test/fitnesse/wiki/fs/FileSystemPageTest.java