modified
conflict
Merge branch 'master' of https://github.com/xpush/node-xpush
mistake in api-server.js