question controller and added user helper
Merge branch 'master' into make_controllers