Fixed failing unit test - assertEquals(double expected, double actual) is now depreciated, using new assertEquals(double expected, double actual, double epsilon) instead. Not sure why this made the unit test fail.
Created a new option "TestTimeout". This was coupled with the HTTP timeout, so if you have a test that takes an hour you no longer need to set your HTTP Timeout to an hour and have to wait an hour before you know your service is down.
Merge branch 'master' into SamJessop-master

Conflicts:
	src/test/java/hudson/plugins/fitnesse/FitnesseResultsTest.java