merged from develop
edo for the way the left-hand pane loads (template rather than straight up json)
fix to disable addition and deletion of users in primary sections