Updated Diff Web API command.

Made it so it won't crash if the change list is very large.
Now supports classic "diff" as well as just geometry changes.
fix protocol check for cli's rev-parse --resolve-geogit-dir
fix functional test errors introduced at 00c94da
'peel' the target Ref before updating HEAD when checkout --force is used.

CheckoutOp was updating HEAD to point to HEAD when force == true, leaving the repository in an inconsistent
state. This patch adds a precondition check to FileRefDatabase.putSymRef(...) to avoid self refs, and makes
sure CheckoutOp 'peels' the target Ref before updating HEAD.
Minor formatting improvements in documentation.

Added space after prompt character in shell examples
Replaced *git* by Git
Extended log command with additional options and improved behaviour
Added a ParseTimestamp operation with support for different syntaxes
Implemented missing case in merge operation (auto-merged features)

This commit also includes some refactoring/renaming to make merge steps and operations clearer and to allow being used in different contexts
Code cleaning has been perfomed and headers have been added to classes that were missing them
Added conflicts support in cherry-pick operation
Added support for rebase operation with conflicts

Also Added documentation for rebase operation and --squash option
Updated headers that were outdated in the merged code
Added all option to featureDiff so that i can get all attributes for a feature through the web-api.

Also fixed Diff to return the feature path instead of the id.
Added support for parsing partial representations of the null id

Added mention to null id in documentation
Merge pull request #253 from volaya/null_id

Added support for parsing partial representations of the null id
Minor changes to pull request.

Fixed compilation error in man page.
Fixed typo in history manual page.
Removed unneeded warning suppression.
Fixed test failure in LogOpPerformanceTest.
Merge branch 'log_improvements'
Merge pull request #243 from jdgarrett/webdiff

Updated Diff Web API command.
Merge pull request #75 from volaya/conflicts_improvements

Conflicts improvements