changed the syntax of define-controller to use define/action.
Merge branch 'controller-form' into dev