Merge remote-tracking branch 'github/canary' into develop
Merge remote-tracking branch 'github/canary' into develop
Merge remote-tracking branch 'github/canary' into develop
Story 48283899: Reorganized dashboard so programs is its own widget, compliance box is gone, systems and processes are now assets, and controls are now governance.
In addition, quick find has been reordered, colors for every top category have been changed, and the object pages for the moved objects have had their colors changed to reflect it.
Story 48783059: Made controls (active pane in quickfind) load but not all of its siblings -- achieves proper function without sacrificing performance
merge rebase
Story 48192365: updating spec and role names
Story 48192365: commenting out ACL9 integration in controllers
Story 48192365: refactoring filters
Story 48192365: adding admin_risk role
Story 48334651: Added app version (based on git tags) to footer
Story 48334651: correct incorrect reset file (should have been stylesheet, was view)
Revert "Story 48334651: correct incorrect reset file (should have been stylesheet, was view)"

This reverts commit 12e2589ed19000eafb794abbebda5c0745ebcb6a.
Revert "Story 48334651: Added app version (based on git tags) to footer"

This reverts commit 5dff99128f9e91164286d1502ea2ac2e1ed82233.
Ensure 'Process Code' stays in the left-most column [story:48439979]
Fix syntax error
Story 43112191: refactoring count method to RelatedModel
story 43112191: changing view code to reflect refactored count method
Story 48833017: unstashing changes
fixing admin role