Added typed conflict resolution delegate and corresponding processing, marked untyped delegate and methods as obsolete.
Added possibility to setup ConfigurationConnectionFactory with a connection string, instead of reading this from the config file.
This enables users to load connection strings from other sources than the standard config file.
fixes #306
Merge pull request #357 from almazik/master

Added typed delegate for conflict resolution and corresponding processing
Merge pull request #358 from robinvanderknaap/master

Added possibility to setup ConfigurationConnectionFactory with a connectionstring instead of connectionname