Merge branch 'master' of git://github.com/collectionspace/ui
Merge remote-tracking branch 'cspace-deployment/master' into ucb-deploy
Merge branch 'ucb-deploy_3.2' into ucb-deploy
PAHMA-721: As a short term fix, change list to show first 60 roles and users.
PAHMA-724: Remove ComputedField listeners after record save, to prevent exceptions.
PAHMA-724: Remove ComputedField listeners after record save, to prevent exceptions.
Merge branch 'ucb-deploy_3.2' into pahma_3.2