Modified tests
Merge branch 'master' into develop

Conflicts:
	lib/network.coffee
	lib/replica.coffee
	package.json
	test/network.coffee
	test/replica.coffee