Bug 846618 - applications data customization
Merge pull request #8424 from yurenju/applications-data-v1.0.1

Bug 846618 - applications data customization, a=tef+
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
Merge remote-tracking branch 'upstream/v1.0.1' into fox-anim-v101
Update httpd to work with Fx 22 nightlies; a partial version of the fix from bug 841711