fixes to ensure correct handling of features using the default feature type
implemented updateTreeType in working tree
changes to improve behaviour for modified featuretypes
first import of merge conflict solving functionality
First working version of merge conflict solving functionality
Improved behaviour of additional operations and commands during conflicted merges
Improvements and fixes for particular cases, and more tests
Added documentation