controller generate
Merge branch 'controllers'