Merge branch 'master' into development
Add generator for controllers
Merge branch 'controllers'