Merge "add web notification feature, but not enabled yet" into zarie