Bug 847299 - After landing Bug 805240 FB automatic synchronization has stopped working
Merge pull request #8415 from lightsofapollo/fix-stupid-wifi-lock-thing

Bug 846959 - Ensure syncComplete event fires and allow callback in syncController r=kgrandon(cherry picked from commit 22ab6a7c5657146fc07496d2b8f3ced87f36daab)
Merge pull request #8432 from jmcanterafonseca/v1.0.1_sync_perm

Bug 847299 - After landing Bug 805240 FB automatic synchronization has s...
Merge pull request #8353 from stasm/845310-remote-debugger

Bug 845310 - Allow enabling ADB access (and remote debugging) via make. r=dhylands(cherry picked from commit 86e007f7b44ca2feb578c1ac55721499e6fe8cab)
bug 828283 - Apps playing sound should not be muted when the screen is put to sleep r=alive
(cherry picked from commit bd65308e5a9fa045e9a0cc83368df0e0ab7b9c3e)
Merge pull request #8481 from AntonioMA/activities_fixes

Bug 847896 - Fix the dial and sms Web Activities. r=francisco, a=tef+(cherry picked from commit e80ad09b2755bedf7202e1294e9495f5d2270f5a)
Merge pull request #8480 from davidflanagan/bug846220

Bug 846220 - don't leave edit mode when handling the browse activity r=jhylands a=tef+(cherry picked from commit 28276e469cb7f9ee8abdb09fe84189bb9898f2f7)

Conflicts:

	apps/gallery/js/gallery.js
(cherry picked from commit 7359be50cc60e737d44ea0d0c0dff29fc2a1a95d)
Merge pull request #8258 from KevinGrandon/bug_811860_sms_audio_perf

Bug 844205 - [SMS] Regression in startup time r=borjasalguero(cherry picked from commit d427c60fd9692573297ba27845bd5f67b5c8fb54)

Conflicts:

	apps/sms/js/sms.js
backout 807f952a0095b4f6b55432f92606887c90f918b1 on v1.0.1 (bug 844205) which was landed by mistake
Bug 841711 - httpd.js extension in DEBUG=1 profiles is broken in current nightly r=fabrice a=npotb

* Load dbg-client.jsm from the correct URI in new Firefox
* bumped up the version
(cherry picked from commit 58b660c1212461f5d310a9800e16c1bcf097031b)
Merge pull request #8326 from EverythingMe/xss-fix

[Bug 840442] fix all XSS vulnerabilities [r=crdlc](cherry picked from commit 749a9c74063bbbd86f7318bfdca1e9050e250a3e)

Conflicts:

	apps/homescreen/everything.me/modules/ShortcutsCustomize/ShortcutsCustomize.js
Merge pull request #8283 from EverythingMe/apps-to-canvas
Merge pull request #8462 from crdlc/bug-847635

Bug 847635 - [B2G][Contacts] Grayed out Facebook fields become editable ...(cherry picked from commit fdf593004911cf5ca35e57f9337da023c10ef55d)
(cherry picked from commit 6d4d7778f68810337462b6a814c6ec5c12ce968e)
Bug 847264 - Allow customizing poweroff animation.
Merge pull request #8575 from rexboy7/fix-bug847264-v1.0.1

Bug 847264 - Allow customizing poweroff animation.
Merge pull request #7603 from lightsofapollo/concat-js-files

Bug 812396 - Aggregate javascript files to reduce load times...(cherry picked from commit 53c83ac323095856522bc00aa41d20fda1594224)

Conflicts:
	build/utils.js
(cherry picked from commit 69cfb9f7d00e5ee7886e40645240686091b6b57e)
bug 846220 - back out 364f2074b7df0e9c1442a269d16a57331dacab0d
Bug 832082 - Stk proactive command to display text does not function properly after receiving set idle mode text, r=vingtetun
(cherry picked from commit cd217e574b202b2e8eb5e48498705e6cd750e457)
Merge pull request #8122 from jmcanterafonseca/bug_841699_fixed

Bug 841669 - Contact list stops loading at certain contact: TypeError: e...(cherry picked from commit c64ee7587c9682856ae653bce95c56aea2daa979)
Merge pull request #8109 from vingtetun/defer

Bug 841353 - 'defer' more scripts. r=etienne(cherry picked from commit 88568d9f69edf0fcb7c59613f961b8804f1eaa88)
Fix Bug 849876 as well.

Conflicts:
	apps/browser/index.html