implemented controller
complete
Merge branch 'admin'