RavenDB-837: Conflicts window now shows the different versions of conflicting documents as links.
Tidied up wording on some of the messages
Minor
Merge branch '2.1' of https://github.com/DanielDar/ravendb

Conflicts:
	Raven.Studio/Models/IndexDefinitionModel.cs
Fixed Case RavenDB-898: use star-sizing instead of auto-sizing for columns in Logs Grid list, to prevent long messages from over-sizing the columns.

Fixed problem with Top level nav not being highlighted correctly when Logs list is in errors-only mode.
Prettified the "New entries" display
Fixed bug where logs display did not update when database changed.
Working on case RavenDb-902: Prettifying the SQL Replication editor
Merge branch 'master' of https://github.com/samueldjack/ravendb into 2.1

Conflicts:
	Raven.Server/RavenDbServer.cs
Merge branch '2.1' of https://github.com/ayende/ravendb into 2.1
update query to use transformers and save the state of options
update text thats notifying about not using index transform any more
added /installSSL and /uninstallSSL options to Raven.Server
RavenDB-949 Show in the studio /debug/user-info
Merge branch '2.1' of git://github.com/DanielDar/ravendb into 2.1
Merge branch 'RavenDB-964' of git://github.com/ppekrol/ravendb into 2.1

Conflicts:
	Raven.Database/Config/ConfigOptionDocs.cs
	Raven.Database/Config/InMemoryRavenConfiguration.cs
	Raven.Database/Config/StronglyTypedRavenSettings.cs
	Raven.Database/Server/NonAdminHttp.cs
	Raven.Server/Program.cs
Fixing the build
Fixing race condition