MINOR: JavaDoc for VectorClock, DatabaseReconciliator, DownOperation
MINOR: Hopefully fix UTF-8 issues by settings file.encoding=UTF-8 in syncany shell/batch script
Merge branch 'log-cmd'
MAJOR: Implement conflict handling based on machine name (last resort after vector clock and timestamp comparison); Discovered another bug with the last common DBV determination
Merge pull request #5 from fabrice-rossi/master

MINOR: New output formats for the log command
MINOR: Merge Fabrice's LogCommand format fix
MINOR: Create TODO.md
MINOR: Update README.md, link to TODO.md
MINOR: Remove next steps text file
MINOR: simplify operation use via covariance.

When FooOperation override execute, it now returns FooOperationResult rather
than OperationResult, leveraging the covariance possibilities introduced in
Java 5.
MINOR: fix a bug in database xml reading when the file size was read as an int rather than a long.
MINOR: minimal fix for the long id problem.

Each new file is assigned an id which is a random long. The set of long is small enough (2^64) to induce a (very limited) collision risk (see http://en.wikipedia.org/wiki/Birthday_attack). With this patch, up to 10 ids are generated in order to reduce further the risk and collisions are detected. The long term fix will imply increasing the id to a 2^128 space.
MAJOR: Centralized naming of database files (db-*) in DatabaseRemoteFile (not yet complete), improved read performance of DatabaseDAO when loading headers only (skip chunks/multichunks/filecontents)
MINOR: Merge Fabrice's changes (more solid file history ID, operation covariance, xml dao int/long fix)
MINOR: TODO.md updates (links to relevant code / starting points)
MINOR: Change some TODO comments
MINOR: align log output in format=last.