Bug 960879 - [music2] Fix the tabs
Bug 961522 - [ftu] typos in ftu: "pckodeLabel" should be "spckcodeLabel", "messasges" should be "messages"
Bug 835307 - Polish l10n properties of Cost Control
Bug 963108 - Remove reference to icc_helper library
Bug 965792 -[Costcontrol] Error on FTE when cardState change
Bug 967540 - [Contacts] Exporting to SD card contacts imported from Gmail with invalid dates never ends
Bug 967708 - [B2G][l10n][Settings] German: "Change PIN" doesn't use localization
Bug 903253 - [Gaia][Video] Video application: handle data transfer
Bug 964755 - Make sure WifiHelper.getCapabilities() return non-null value for network not in the air
Merge pull request #15960 from dwi2/bug964755

Bug 964755 - Make sure WifiHelper.getCapabilities() return non-null valu...
Bug 966893 - [Search] Adjust font size
Bug 955995 - Running settings.js on node.js
Merge pull request #15723 from cctuan/955995

Bug 955995 - Running settings.js on node.js
Bug 966243: Fix ICC detection handlers in Settings app, r=arthur.chen

While running the Settings app several errors about self.* not being
defined show up in the logcat. An example is

  E/GeckoConsole(  440): [JavaScript Error: "TypeError: self.updateSimPinsUI \
    is not a function" {file: "app://settings.gaiamobile.org/js/simcard_lock.js" \
    line: 232}]

This is caused by 'self' not being set in the event handlers for ICC
detection. As a result, the UI update does not work correctly when the
ICC changes state. Setting the variable 'self' fixes this problem.

Signed-off-by: Thomas Zimmermann <tdz@users.sourceforge.net>
Merge pull request #15907 from tdz/bug-966243

Bug 966243: Fix ICC detection handlers in Settings app
Revert "Revert "Merge pull request #15857 from comoyo/bug964216""

This reverts commit 33eb812eadb61f76744103105e099972a8255843.
Merge pull request #15966 from timdream/keyboard-build-2

Revert "Revert "Merge pull request #15857 from comoyo/bug964216""
Merge pull request #15837 from gitmai/bug-965792-CC-error-FTE

Bug 965792 -[Costcontrol] Error on FTE when cardState change
r=salva
Merge pull request #15649 from gitmai/bug-963108-remove-icchelper-reference

Bug 963108 - Remove reference to icc_helper library
r=salva
Merge pull request #15964 from KevinGrandon/bug_966893_adjust_font_size

Bug 966893 - [Search] Adjust font size