conditional display depending on user permissions
Merged branch user-permissions