pub/sub: 1st step
Merge branch 'master' of github.com:liyu1981/DynamicPoint

Conflicts:
	client/lib/common.js
	client/profile.js
	server/method.js
	server/pub.js