ManagerController added
Merge origin/master
ManagerController added