Changes

* Tony Yu

* Barry Tulchinsky

|-

|Improve Webmaker local-deploy/dev situation || || [Pomax, cade, k88hudson] ||

* Barry Tulchinsky

|-

* Mark Aronin

* Xiaodong Chen

|-

| Popcorn Maker Improvements and fixes|| https://bugzilla.mozilla.org/show_bug.cgi?id=909428 <br> https://bugzilla.mozilla.org/show_bug.cgi?id=909751 <br> https://bugzilla.mozilla.org/show_bug.cgi?id=907766 <br> https://bugzilla.mozilla.org/show_bug.cgi?id=900580 <br> https://bugzilla.mozilla.org/show_bug.cgi?id=890416 <br> https://bugzilla.mozilla.org/show_bug.cgi?id=859116 || [mjschranz, thecount] ||