Add env var for RABBIT_HOST (bug 1083690)
Include waffle switches and FxA stuff in commonplace index.html (bug 1093584)
remove docker fireplace development lines from commonplace template (bug 1073617)
generate proper Contribution for zippy (bug 1091021)
Merge pull request #2708 from ngokevin/rmfireplacelines

remove docker fireplace development lines from commonplace template (bug 1073617)
Small optimizations to FeedView (bug 1088329)
remove en-US from FxA URL
Commit from Mozilla Verbatim by user kohei.yoshino@gmail.com.: 1992 of 1992 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Use `AppESHomeField` for `FeedCollectionESHomeSerializer` (bug 1088329)
Merge pull request #2705 from diox/return-waffles-with-index.html

Include waffle switches and FxA stuff in commonplace index.html (bug 1093584)
Detect region with geoip in fireplace if no SIM info is passed (bug 1082855)
Merge pull request #2695 from diox/return-geoip-region-with-index.html

Detect region with geoip in fireplace if no SIM info is passed (bug 1082855)
Send `persona` for existing accounts in AccountInfoView (bug 1094384)
Merge pull request #2713 from mstriemer/account-existance-info-1094384

Send `persona` for existing accounts in AccountInfoView (bug 1094384)
Commit from Mozilla Verbatim by user ouesten.: 1906 of 1992 strings translated (0 fuzzy).
add in a from address so people can reply
Merge pull request #2714 from andymckay/from-address

add in a from address so people can reply
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Commit from Mozilla Verbatim by user kohei.yoshino@gmail.com.: 1992 of 1992 strings translated (0 fuzzy).