Fixed an issue which caused tree metadata id to be lost when resolving conflicts.
Added support for aliases in OSM, and refactored and fixed previous OSM tools

-Package structure is less fine-grained
-Operation test do not use cli
-Added comments to tests
-Rewrote harcoded field indexes in unmap operation
-Declared version of osmosis dependence in parent pom file
-Guava Files class is now used to read filter an mapping files
Fix broken link
Fix broken link
Offload 'seen' set to BDB during object packing
Correct some errors in the quickstart
Revert "Offload 'seen' set to BDB during object packing"

This reverts commit 18a96e1df5b529e0eeda2e730e65aa7877abab0c.
Fixed issue when unmapping unchanged features
added how to help page

Conflicts:
	README.rst
Changed how and incomplete OSM download is handled

Download with incomplete entities is now not an exception and the cli command exists with 0 code

This fixes a bug with the log file, which was not written before in the case of an incomplete download
"Fix an issue that caused FeatureStore edits to change the metadataId of RevFeature nodes.

Geogit supports adding features of disparate feature types as direct children of the same tree.
This shadowed an issue with the geogit FeatureStore implementation that was causing to store
feature nodes with their own metadataId instead of blank (and hence defer to the tree's default one)
when a namespace is assigned to the DataStore.
This patch makes sure both inserts and updates through the geotools api use a feature with the
native/internal FeatureType and hence ensures their metadataId will remain loyal to the tree's default.
Merge remote-tracking branch 'origin/pr/340'
Merge pull request #350 from groldan/issue_310

Fix "Editing features changes the feature type."
Fixed some issues with the Neo4JGraphDatabase.

Fixed two potential infinite loops.
Use a UniqueFactory to ensure that duplicate nodes are not created.
Added fetch, pull and push to web-api. Updated remote web-api to support adding and removing remotes.
Added the statusCode from the RemoteException to the error response.
Revised the response for Fetch web-api command.
Updated CheckoutWebOp and PullWebOp to support conflict resolution.

Updated CheckoutWebOp to support ours and theirs options to resolve conflicts with.
Updated PullWebOp to return the merge commit result so that we can show conflicts if they should arise.
Updated MergeReport to store the objectIds of ours, theirs and ancestor commits.
Fixed a problem with TransactionEnd so that it didn't stop if there was a NothingToCommitException in the case of a fast-forward.
Handled NothingToCommitException in PullOp, made MergeWebOp use the objectIds being stored in the report.
Some minor fixes.

Made it so you don't have to specify a message, mainly just to keep the merge commit message that gets saved.
Added a null check to Push in case a null ref spec was passed in.
A fix to merge, which i accidentally broke in my last commit.