CRLF
Fixed bug where disposing of one changes subscription would also dispose others.
Working on RavenDB-837: Implemented a page to show all conflicts
minor - use JsonData and JsonMetadata properties in EditableDocument as shortcut for setting text.
Added a navigator so that users can page through documents with conflicts in the Edit window.

Fixed problem where document was not shown in conflicts mode if navigated to using paging controls.
Merge branch 'master' of github.com:samueldjack/ravendb

Conflicts:
	Raven.Client.Lightweight/Changes/LocalConnectionState.cs
minor
Merge branch '2.1' of https://github.com/DanielDar/ravendb into 2.1
RavenDB-912 When using backups from studio, expose Defrag option
RavenDB-906 When saving SQL Replication doc, offer to reset replication
Merge branch 'master' of https://github.com/ayende/ravendb

Conflicts:
	Raven.Client.Lightweight/Changes/LocalConnectionState.cs
Refactored the top-level tabs in the UI so that they can now

act as split buttons.
Merge branch 'master' of github.com:samueldjack/ravendb into 2.1

Conflicts:
	Raven.Studio/MainPage.xaml.cs
	Raven.Studio/Models/EditableDocumentModel.cs
Merge Fix
Change the way we select colors for collections
Show only one line of collections with a splitter to show more
Make statistics base for "stats" tab
Update breadcrumbs according to tab location
Fix typo that broke the statistics page
Send a message if non admin is trying to run admin command
Fix math of color for collections