New controller
Merge branch 'master' of github.com:Huaxin-DevTeam/web