Merged election to failure branch
Merge branch 'master' into daniel-failuredetection
Merge branch 'master' into daniel-failuredetection

Conflicts:
	common/MachineInfo.java
	election/election.java
Small commit.
Merge from failure detection.