implement admin controller namespace
merged conflicts
Admin stuff is in the right places thanks danny
Merge branch 'admin'