Bug fix.
Merge branch 'haog' of https://github.com/gaohao/peernet into haog

Conflicts:
	utils/fakeserver.js