Add simple security manager
Fix for global users
Fix for global users
Fix security rules
Merge with development