:)
Merge branch 'master' of https://github.com/xpush/xpush-manager

Conflicts:
	config/xpush.json