Bug 883510 - Partner customization should be able to set Facebook OAuth ...
(cherry picked from commit e7479d38f3093a4b9b56d4204057c5711d7f7935)
Bug 888137 - Merge pull request #9895 from RudyLu/keyboard/Bug860318-layout_improvement_commit2
             Bug 860318 - Update keyboard visuals to improve performance. r=timdream
             (cherry picked from commit e6579f1a2a7d980ae93bfa4ffdcbdf47eac8ae97)

Conflicts:
	apps/keyboard/js/render.js
	apps/keyboard/style/keyboard.css
Merge pull request #10572 from RudyLu/keyboard/Bug796600-scrollable_keyboard_layout_menu_commit

Bug 796600 - make the keyboard layout menu scrollable. r=djf(cherry picked from commit 94b7c5ac0cef9439eeee8ca1421c52ccc10421a8)

Conflicts:

	apps/keyboard/js/render.js
Merge pull request #8760 from gasolin/issue-830057

Bug 830057 - [bluetooth][gallery] Icon missing for Bluetooth Transfer in..., r=Ian
(cherry picked from commit 412c325cd87692e38739642b7a204007c4ff151b)
Bug 883058 - [SMS/MMS] One contact with very long name can be scrolled in recipient field r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=883058

- Removes rule about a single contact prohibiting pull down
- Height of recipient-list itself is informative enough to determine "pullable" status
- http://en.wikipedia.org/wiki/Taumatawhakatangihangakoauauotamateapokaiwhenuakitanatahu

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit ef031421fe8d4257fe198112b52d4d963a828498)
Merge pull request #10492 from flodolo/bug883763

Bug 883763 - Fix localizability of "Cell broadcast service", r=kaze
(cherry picked from commit 2990b77b17d88ffcf22ed99bec2f8798211a7a71)
Merge pull request #10666 from steveck-chung/bug-887216

Bug 887216 - [MMS] The header in a group message is active, it works as the go back key
(cherry picked from commit 66bc6cbd4954b423c36cb88c63cf9603d1643e26)
Merge pull request #10676 from mcirlanaru/bug_880617

Bug 880617 - Properly set and display the MAC address. r=@fabi1cazenave
(cherry picked from commit 9e70675f17e450920090ccc8e58c076d3760771e)
Merge pull request #10693 from leob2g/Bug_880866_Adding_Localizable_string_calendar

[880866][Calendar]Adding new "From" and "To" strings to Detail view for localization. r=lightsofapollo
(cherry picked from commit 24d93dce98e7c0d7ae3b5527bf8ed22189e918ee)
Revert "Bug 840147 & Bug 877903 : fix orientation problem on open/close app animation."
 - Backout this change since it caused Bug 888339.

This reverts commit 4a5aa95c17656a84395eb78763f7f1c0f9623827.
Merge pull request #10487 from frsela/Bug884745

Bug 884745 - Change debug() method to the new window.DUMP in icc*.js, r=kaze(cherry picked from commit 08c9cf50fe1d2e8bbb3931d61e0a30c6a1bc6b6c)

Conflicts:
	apps/settings/index.html
Merge pull request #10607 from frsela/STK/Bug880356

Bug 880356 - [STK] "STK_CMD_GET_INPUT" code refactoring, r=timdream(cherry picked from commit b2da43408f4f53429db6b0a7f22c80aa73b87580)

Conflicts:
	apps/settings/js/icc.js
Merge pull request #10678 from Rik/translate-comments-883787

Bug 883787 - Translate lazy loaded panels after loading them r=kaze
(cherry picked from commit aa2676c1a79de4ee21664abf78bae97645cf83ae)

Conflicts:
	apps/communications/dialer/js/dialer.js
Merge pull request #10568 from lodr/bug-885314-highlight-out-of-date

Bug 885314 - Highlight how balance is going out of date.
r=jmcanterafonseca
(cherry picked from commit c8f72f628bf350d6425b4c6569965e8ad00b3d80)

Conflicts:
	apps/costcontrol/widget.html