Made it so conflicts are not stored on the base repository during transactions.
Fixed an issue with the conflicts being stored in the wrong directory.
Added javadocs.
"previsit" ancestors of commits being sent during network sync
Improved revert operation to add better handling of conflict cases
fixed bug when resolving default geometry.

The mapping to get the index of the geometry field was used twice, resulting in a wrong index and a later ClassCastException when getting the value.
Merge pull request #302 from jdgarrett/transaction-conflicts

Store Conflicts Separately for Transactions
Merge pull request #297 from dwins/previsit_in_network_transfer

"previsit" ancestors of commits being sent during network sync
Merge pull request #316 from volaya/defaultGeometry

fixed bug when resolving default geometry.
Merge branch 'volaya/revert_conflicts' into master