fix spinner on second dismissal (bug 1033698)
Commit from Mozilla Verbatim by user sektormaster@atlas.sk.: 240 of 240 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/fireplace
Commit from Mozilla Verbatim by user kelemeng.: 240 of 240 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/fireplace
revert to short names for china/taiwan flag icons (bug 1041520)

remove fr.png from this PR

taking locale flags out of region folder

re-add the removed line that I shouldn't have added by now confuses git into deleting
Merge pull request #531 from dethe/duplicate_flags

revert to short names for china/taiwan flag icons (bug 1041520)
Add padding so flag works with web font (bug 987696)
Merge pull request #539 from dethe/truncated_flag

Add padding so flag works with web font (bug 987696)
Merge branch 'master' of github.com:mozilla/fireplace
Merge pull request #537 from cvan/clear-spinner-on-second-click

fix spinner on second dismissal (bug 1033698)
Merge branch 'master' of github.com:mozilla/fireplace
Commit from Mozilla Verbatim by user keko.gl.: 240 of 240 strings translated (0 fuzzy).
Add back geoip fetch in consumer info (bug 1043263)
Merge pull request #533 from diox/fix-region-geoip

Add back geoip fetch in consumer info (bug 1043263)
Wait on consumer_info promise in login (bug 1038985, bug 1039868)

We need to wait for consumer-info because it's the source of the
waffle switches - if we don't, then sometimes the fallbackFxA check
is done too early and returns false when it's enabled.
Merge pull request #540 from diox/fallback-fxa-race-condition

Wait on consumer_info promise in login (bug 1038985, bug 1039868)
Fix wrong merge conflict resolution (bug 1038985, bug 1039868)

See https://github.com/mozilla/fireplace/commit/57b14faa5b1bb97d4d37a846133bbdc67b680df0#commitcomment-7227864