Don't drop local settings file (bug 1084328)
Merge pull request #146 from muffinresearch/dont-drop-local-settings-file

Don't drop local settings file (bug 1084328)
Back-out unecessary z-index bumpt
Save JWT in localStorage for FxA auth (bug 1082165)

Fixes #145
Don't save `null` to sessionStorage for JWT
Commit from Mozilla Verbatim by user umesh007.: 72 of 72 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user umesh007.: 72 of 72 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/spartacus
Commit from Mozilla Verbatim by user umesh007.: 72 of 72 strings translated (0 fuzzy).