优化代码
Merge branch 'master' of https://github.com/steedos/pushd

Conflicts:
	lib/pushservices/apns.coffee