Include licensecheck-config and top level pom in the release artifacts.
Upgraded lucene version to 3.6.2
removing arbiter service scripts from community and advanced packages
Merge pull request #614 from lassewesth/arbitercleanup

removing arbiter service scripts from community and advanced packages
Merge branch 'lucene-3.6' of git://github.com/tinwelint/neo4j
Removed URL discovery mechanism for clustering
Removed unused codename scripts and icons
updated HAProxy documentation with new master/ slave endpoints
Merge pull request #617 from lassewesth/hastatus

updated HAProxy documentation with new master/ slave endpoints
Merge pull request #591 from nawroth/include-for-release

Include licensecheck-config and top level pom in the release artifacts.
centralised lucene version
Cypher errors are now shown nicely in webadmin data browser
Merge remote-tracking branch 'origin/master'
Added a test logger implementation, for testing that components log things correctly.
Fixes test and changes matcher from deprecated JUnit to hamcrest
Same fixes as before, this time for cypher plugin
Merge pull request #619 from jakewins/test-logger

Added a test logger implementation, for testing that components log thin...
Merge branch 'master' into 2.0

Conflicts:
	community/cypher/src/main/scala/org/neo4j/cypher/internal/spi/gdsimpl/GDSBackedQueryContext.scala
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeManager.java
	community/server/pom.xml
	community/server/src/functionaltest/java/org/neo4j/server/rest/CypherFunctionalTest.java
	community/server/src/main/java/org/neo4j/server/rest/web/CypherService.java
	community/server/src/main/metadata/codenames.properties
	cypher-plugin/src/test/java/org/neo4j/server/plugin/cypher/CypherPluginFunctionalTest.java