Implemented conflict solver which are able to solver parts of the conflict
Whitespaces
Changed from fsFactory to interface
Improved solver constructor interfaces of conflict solver
Merge branch 'rc/2.0.0' into develop