RavenDB-837: Conflicts window now shows the different versions of conflicting documents as links.
Tidied up wording on some of the messages
Minor
Change in bucket generator (Breaks indexes), to improve mapreduce indexing speed by grouping sequential elements closer in buckets
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.
Exposing database id on the stats
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
Merge branch 'master' of github.com:ayende/ravendb
Better url for API keys
Merge branch 'master' of ..\RavenDB-2.0 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
Revert "RavenDB-964"

This reverts commit 59ddd966ac422637ef547e192296bd5d9a5f2d57.

Conflicts:
	Raven.Database/Server/NonAdminHttp.cs
Avoid throwing an error on None
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