Merge
Added expiry to cookies on client side, also added logout button to UI