Merge pull request #206 from jaoo/1069227

Bug 1069227 - [Loop] Make sure that we recover from an expired token situation. r=ferjm
(cherry picked from commit 89d0c8921c26ede101f4945cdda1ac9436b0a9b5)

Conflicts:
	js/version.js
Bump up version