Factored out PrettyToString trait
Restore messages.log in server.
Merge pull request #2479 from jakewins/2.1-messages.log

Restore messages.log in server.
Update SNAPSHOT version after 2.1 release.
Add upgrade notes for 2.0->2.1
Merge pull request #2480 from cleishm/2.1-upgrade-notes

2.1 upgrade notes
For server startup, don't try and recover stores unless they contain store files.
Merge pull request #2481 from jakewins/2.1-serverecovery

Improved recovery check for server
StoreRecoverer uses filesystemabstraction to check file existance.
Merge pull request #2482 from jakewins/2.1-serverecovery

StoreRecoverer uses filesystemabstraction to check file existance.
Tagging for version 2.1.1
Back to development version.
Update SNAPSHOT version in POMs after 2.1.1 release.
Introduced a new way to write planner tests

Moved CartesianProductPlanningIntegrationTest to this new way
Merge pull request #2487 from systay/planner-tests

Introduced a new way to write planner tests
Move Scala test file from src/test/java to src/test/scala.
Added asserts
Moves *PlanningIntegrationTest to the new test format
Merge pull request #2493 from jotomo/scala-test-dir

Move Scala test file from src/test/java to src/test/scala.
Merge pull request #2494 from systay/planner-tests

Moves *PlanningIntegrationTest to the new test format