Now works with HTTPS as well
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	community/server/src/main/java/org/neo4j/server/rest/batch/BatchOperations.java
Fixed message reordering issue by using two stacks
Now with test, and actually produces correct order
Update the Cypher introduction.
Documentation improvements all around.
Merge remote-tracking branch 'origin/master'

Conflicts:
	enterprise/cluster/src/test/java/org/neo4j/cluster/StateMachinesTest.java
Remove duplicate shutdown
Merge pull request #1579 from nawroth/2.0-fixes

Documentation improvements all around, without breaking server-plugin tests.
Merge pull request #1584 from nawroth/cypher-intro-step-one

Update the Cypher introduction.
Expand on the documentation for installing as a service on Linux, and running from the command line on OS X.
Refactors state machine contexts into interfaces

This commit is a needed refactoring to make state machines more testable.
 It removes all dependencies from all state machine contexts that before
 had them interconnected and all tangled up, requiring multiple levels
 of mocking. Instead, now they are all implemented by MultiPaxosContext
 which takes care to factor out common needed functionality. While the
 diff is large, it does not represent too big of a change.
Fixes Paxos instance reuse issue

It is possible for a Paxos instance to be started before a previous
 instance has been closed, and to use the same instance Id. A potential
 bug around this is that on receiving phase1Timeout for the second
 instance, the message will be dropped altogether and not retried, as
 the proposer state machine considers the instance closed.
 This commit fixes this issue and introduces a test case for it.
Fixes issue with instances properly changing to PENDING on losing quorum

Instances in TO_SLAVE or TO_MASTER state will remain forever in that state
 if quorum is lost and regained. This commit adds tests for this condition
 and removes an if statement that caused it.
Ensures that ProposerState unbooks retried instances
Style fixes
Added a note about Admin privileges and SmartScreen to the Windows installation part of the manual.
Unused imports
Merge pull request #1587 from chrisvest/manual-installation

Expand on the documentation for installing as a service on Linux, and ru...