Commit
line serv conf changes - for ND testing
Server2Server BS - connect - partially implemented
nconnect - commented
Merge remote-tracking branch 'origin/master' into db_branch

Conflicts:
	classes/eye/Comm$Header$Builder.class
	classes/eye/Comm$Heartbeat$Builder.class
	classes/eye/Comm$Management$Builder.class
	classes/eye/Comm$Network$Builder.class
	classes/eye/Comm$Payload$Builder.class
	classes/eye/Comm$PayloadReply$Builder.class
	classes/eye/Comm$Request$Builder.class
	classes/eye/Comm$Response$Builder.class
	classes/poke/resources/DocumentResource.class
	classes/poke/server/management/HeartbeatManager.class
	src/poke/resources/DocumentResource.java
Merge remote-tracking branch 'origin/master' into db_branch

Conflicts:
	classes/poke/resources/DocumentResource.class