Merged with [URBNG-274] Add logout functionality. Some fixes added.
Merged with [URBNG-274] Add logout functionality. Some fixes added.