add logout to controller
merge from origin