Bug 890004 - Completion of UA override changes for B2G 1.1 r=fabrice
Merge pull request #10566 from leob2g/Bug_885927_Adding_String_Localize_for_Edit

[885927][Calendar]Edit string adding to locale files for localization. r=lightsofapollo
(cherry picked from commit 18d39f8bbf25905da1bd1df6147d815bda1052db)
Merge pull request #10983 from gaye/bug-889396

Bug 889396 - Sync button went away r=lightsofapollo
(cherry picked from commit ab895af6425ed0100afa1d3d9871126e3f4552df)
Merge pull request #10991 from jlebar/gaia-event-listener-leak

Bug 894081 - (Try to) fix a leak in Gaia by registering its mozbrowserer...r=alive
(cherry picked from commit d85dbb240e000903c9cb0a7a1f8aff45b3592e28)
Merge pull request #10967 from frsela/STK/Bug893614

Bug 893614: [STK]The maxlength of the inputbox didn't set corretly in GET_INPUT command. r=timdream
(cherry picked from commit c340cc85151a3387746c1e0cf742bb8c2e8b09fb)
Merge pull request #10968 from huchengtw-moz/camera/Bug_881664_camera_pick_pitfall

Bug 881664 - Camera 'pick' pitfall when there is no sdcard. r=daleharvey(cherry picked from commit cdf71136ae6233cb790e9f9be16ae456726e38c1)

Conflicts:
	apps/camera/index.html
	apps/camera/style/camera.css