:b
Merge branch 'master' of https://github.com/xpush/node-xpush

Conflicts:
	lib/server/session-server.js