Fix for checkout —theirs or checkout —ours not working if theirs or ours was a deleted node.
Fixed some issues with handling deleted features while resolving merge conflicts.
Propagate conflicts on end transaction.
Fixed incorrect exceptions in unit tests.
Move default featureSource/Collection/Iterator decorators to core
Add availableProcessors():int method to Platform
Fix WorkingTree.insert(FeatureSource, ...) multithreaded import missing the last features
Merge pull request #557 from groldan/issue_554

Fix off by #processors - 1 missing features when importing from a FeatureSource
Use ExecutorService.shutDown() instead of shutDownNow() which may cause problems to close the bdb database
Fix travis status link
Add missing ls command
added py4j entry point
Merge remote-tracking branch 'origin/pr/555'
Merge remote-tracking branch 'origin/pr/542'
Merge remote-tracking branch 'origin/pr/540'
Revert "Fixed incorrect exceptions in unit tests."

This reverts commit 69352838800b6be8cceffb4b7139e79c53aa9856.
Merge remote-tracking branch 'origin/master' into plugins