Attempting a fix for having the remote refs be copied over when a transaction ends.
Added partial stack trace to unexpected exception responses to help with web-api debugging. Fixed a bug in EndTransaction.

In TransactionEnd, when it does a merge commit there was the possibility for it to result in conflicts thus leaving the repo in a conflicted state. To fix this we use the their's strategy as a temporary solution.
Fixed filename of quickstart and added it to index in doc/manual
Bump version in quickstart.rst
Skip SQLite tests if Spatialite fails to load
Merge pull request #337 from dwins/conditional-sqlite-testing

Skip SQLite tests if Spatialite fails to load
Fixed an issue which caused tree metadata id to be lost when resolving conflicts.
Merge remote-tracking branch 'origin/pr/327'
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
Add SQL Server Import / Export capabilities
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
Improvements to SQLServer support

-Corrected exit codes in case of exception
-Added documentation
Merge pull request #1 from volaya/sqlserver

Improvements to SQLServer support
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