Base functionality
Fixed ActiveAdmin
Merge branch 'administration'