integrate current_user
add missing end, reformat
Merge branch 'master' into sctrl