user controller, some answer controller action
Merge branch 'master' into make_controllers