my
Merge branch 'master' of https://github.com/ayende/ravendb
database settings changes
 RavenDB-2147 Installer will not override the configuration file and not even delete it on uninstall
Installer - changing 'Product version' of RavenDB.Setup.exe to 3.0
Merge branch 'master' of github.com:grisha-kotler/ravendb
Merge branch 'master' of https://github.com/ayende/ravendb
function refactoring
started working on scoped ScriptedJsonPatcher
Merge branch 'RavenDB-2036' of https://github.com/ReginaBricker/ravendb

Conflicts:
	Raven.Server/App.config
Fixing bad version
Better detection when to automatically generate human readable json
RavenDB-1825 Need to throw an error when using Scripted Index Bundle to modify a document indexed using LoadDocument
minor cleanup around CustomizeEngine in ScriptedJsonPatcher
better exception message
Better handling of CORS
added one more test for RavenDB-1825
Merge branch 'RavenDB-1825' of https://github.com/ppekrol/ravendb
RavenDB-2183 'Raven.Abstractions.Linq.DynamicList' does not contain a definition for 'Take'
Merge branch 'RavenDB-2183' of https://github.com/ppekrol/ravendb