Make admin object global

To make it easier to alter the admin behavior the admin object should
be made into a global variable. This addresses that.
Merge branch 'develop'