Merge branch 'master' of github.com:ayende/ravendb

Conflicts:
	Raven.Tests/Issues/RavenDB_1603.cs
Merge branch 'master' of github.com:ayende/ravendb
Merge branch 'master' of github.com:ayende/ravendb into concurrent_index_changes
minor fix -> compilation
Merge pull request #1600 from ppekrol/master

fixed invalid configs
RavenDB-2947 Do not consider the conflict item doc (e.g. items/1/conflicts/{guid}) as conflicted document in order to not apply the resolution from /studio-tasks/resolveMerge endpoint. Instead just show its content.
RavenDB-2947 Do not add "@metadata" string to MergeResult.Metadata. Adding tests for conflict resolutions in metadata.
Merge pull request #1601 from arekais/RavenDB-2947

Raven db 2947
Merge pull request #1602 from ppekrol/master

RavenDB-2948 High memory usage
Merge branch 'master' of github.com:myarichuk/ravendb

Conflicts:
	Raven.Database/Bundles/SqlReplication/SqlReplicationTask.cs
	Raven.Tests/Issues/RavenDB_1603.cs
Merge branch 'master' of github.com:ayende/ravendb

Conflicts:
	Raven.Database/Bundles/SqlReplication/SqlReplicationTask.cs
	Raven.Voron/Voron/Slice.cs
fixing issue of "output(true)" in ScriptedPatch javascript
Merge pull request #1603 from myarichuk/output-function-in-scriptedpatch

fix for using "output(true)" in ScriptedPatch
Fixing an issue where transformers without explicit fetch wouldn't get the reduce result properly
Merge branch 'master' of github.com:ayende/ravendb
RavenDB-2956 Place a hard time limit on the amount we spend in CheckReferenceBecauseOfDocumentUpdate
RavenDB-2885 Studio : Manage Your Server : Admin Logs - change 'insert new row'
Merge pull request #1604 from ml054/RavenDB_2885

RavenDB-2885 Studio : Manage Your Server : Admin Logs - change 'insert n...
RavenDB-2886 Studio : Manage Your Server : Traffic Watch - placeholder is not descriptive
Merge pull request #1605 from ml054/RavenDB_2886

RavenDB-2886 Studio : Manage Your Server : Traffic Watch - placeholder i...