RavenDB-2349 Debug endpoint that creates debug info package
RavenDB-2348 Provided conflict merge view
Merge branch 'RavenDB-2348'

Conflicts:
	Raven.Database/Server/Controllers/StudioTasksController.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs
Merge branch 'RavenDB-2349' of github.com:arekais/ravendb
fixed RavenDB_1666 failing test problem with  SimulateSqlReplication
Merge branch 'master' of https://github.com/ayende/ravendb
Merge branch 'master' of https://github.com/maximburyak/ravendb