Update to ActiveAdmin HEAD

ActiveAdmin issues 1773 and #1940 have been closed and merged. Changes are not released yet, so we need to use ActiveAdmin master for now.