added appending &token
merged
removed some trash in lib file
Merge remote-tracking branch 'upstream/master'
Updated LogOff to reflect token changes.