change default controller
Merge branch 'dev'