upgraded netty and refactored netty resource management
Merge remote-tracking branch 'upstream/master' into netty363
Removes unused class FileChannelLoggingService
Adds ability to log user centered statements to a different channel

Introduces LogMarker as a way to tag log statements, modelled after slf4j's Marker
Introduces ConsoleLogger as an overlay over logger to have it log in INFO and with
 a particular marker so statements can be filtered
Introduces ConsoleLoggingFilter so configuration can select to print to console
 certain statements
Removes console logging from the set of default appenders in neo4j-logback.xml
Adds console loggging for interesting for the user events

ClusterJoin now prints basic cluster joining activities
HAMS now prints startup mode, branching and store verification events
SlaveStoreWriter notifies of the progress of a store copy
Fixes logging configuration in packages

Fixes Diagnostics logging on all platforms and allows for console.log printing
Fixes compilation error
Adding missing Cypher keywords to highlighter. Minor doc fixes.
renamed logger to messages log. fixed compile issue. updated console log messages
Merge remote-tracking branch 'upstream/master'
Refactoring and clean up
Add methods for setting skip/limit from expression
Allows for additivity on the base logger
Adds extra check for config error message and also imports the server_id setting
Updates changeslogs to the proper RC1 date
Updates HA setup tutorial for the new startup script behaviour
fixed mailto link
Add helper for setting start items
Fixed grammar. We are avoiding deadlocks, not advertising them...
Merge remote-tracking branch 'upstream/master' into 2.0

Conflicts:
	community/cypher/CHANGES.txt
	community/cypher/src/test/scala/org/neo4j/cypher/docgen/FunctionsTest.scala
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/server/CHANGES.txt
	community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityModeSwitcher.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/id/HaIdGeneratorFactory.java
	packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/CHANGES.txt
	packaging/standalone/standalone-community/src/main/distribution/text/community/CHANGES.txt
	packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/CHANGES.txt