还原master的初始controller
Merge branch 'cj'