[71716134] Refactor code so session[:user_id] is only present in methods on application controller

Signed-off-by: Paul Stone <pmstone247@gmail.com>
fixed merge conflict

Signed-off-by: Paul Stone <pmstone247@gmail.com>