apply changes to deal with expired tokens correctly

Signed-off-by: William Rockwood <wrockwood@tadl.org>
Merge branch 'master' of github.com:tadl/egMobile