Added notes on ubuntu 14.04 NPM, and MacOSX grunt for browser build dependencies
Added rolling log file support. Default is roll every day, keeping max 7 days history

Refactored database factories to use IAGDB.Dependencies instead of deps one by one

Bug fixes

Merge branch 'master' into rollinglogs

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreMigrator.java
	community/neo4j/src/test/java/upgrade/StoreMigratorFrom19IT.java
	community/server/src/main/java/org/neo4j/server/CommunityNeoServer.java
	community/server/src/main/java/org/neo4j/server/WrappingNeoServer.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java
	enterprise/com/src/main/java/org/neo4j/com/storecopy/StoreCopyClient.java
(cherry picked from commit c6ffd93)
Make optional matches sets and not lists
Move the refcard in under the manual.
Change how greedy the greedy planner is

Before this change, for each step taken in the planning process,
a single best plan would be picked, and added to the plan table.
This would prune out any plans covered by the new best plan.
After this change, Ronja picks the best plan per set of covered ids.
This broadens the search space some, and prepares the planner
to be able to find more effective plans for queries with cycles.
Hash join support for joining on multiple keys.
Merge branch 'master' into rollinglogs3

Conflicts:
	community/server/src/main/java/org/neo4j/server/database/DatabaseRegistry.java
	community/server/src/test/java/org/neo4j/server/database/DatabaseRegistryTest.java
Random byte[] for start entry header to randomise tx checksum
Merge pull request #3127 from rickardoberg/rollinglogs3

[2.2] Support for rolling logs
added metadata entry to the node REST representation
Fixes issue recognizing inUse of dynamic record

the check looked at the whole upper nibble of the inUse byte and expected
it to == 1, which means that it would not recognize it as inUse if any
other bit in that nibble was set.
Merge pull request #3123 from craigtaverner/master

[2.2] Added notes on ubuntu 14.04 NPM, and MacOSX grunt for browser deps
Merge pull request #3121 from nawroth/move-refcard-2.1

[2.1] Move the refcard in under the manual.
Merge remote-tracking branch 'upstream/2.1-maint'
Merge branch '1.9-maint' into 2.0-maint
Merge branch '2.0-maint' into 2.1-maint
Merge pull request #3134 from systay/new-greedy-strategy

[2.2] New greedy strategy
Merge branch '2.1-maint'

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/impl/store/AbstractDynamicStore.java
Merge branch '1.9-maint' into 2.0-maint
Merge pull request #3118 from jexp/2.1-maint

[2.1] added metadata entry to the REST representation