Merge branch 'admin'
some small bits of cleanup
Merge branch 'master' into admin
removed some debug logging
some more cleanup
Merge branch 'master' into admin