moved helps to controller
Merge branch 'master' into controller_refactor