updated to be compatible with UnifiedPush Server v0.11.0
Merge branch 'UpdateToLatest'