consolidating
Merge branch 'master' of https://github.com/interiorae/admin_utilities