Bug 958003 - [Keyboard][V1.4] FxOS cannot pops up third party keyboard after process manager kills it
    -- after OOM keyboard will not get 'oninputcontextchange' at first time while keyboard app is using
    -- so can not only depens on 'oninputcontextchange' to show keyboard layouts.
Bug 932270 - Make AM/PM localizable in 12 hours format
Bug 972701 - [Camera] Stop Icon overlaps with Camera Shutter icon while recording video

Conflicts:
	apps/camera/style/controls.css
Bug 973828 - Resume the app when a system message access a suspending app
Bug 965853 - Display SIM indication in missed call notification

Refactored mock_call to handle several handlers for one event type
Moved a few files to jshint linting
Bug 972804 - [Camera] Separate settings for camera and video flash
Bug 973941 - Background image request follow-up r=amirn
Bug 950147 - Add new Illustrative Wallpapers for v.1.4
Bug 974283 - Fix intermittent failure of test_music_album_mp3.py
Bug 973593 - Address failure in test_cost_control_data_alert_mobile.py
[B2G] [1.2] [l10n] [Contacts]: Current location header from Facebook contacts is shown in English on every language
Bug 974361 - Memory average assumes the array of measurements always exists
Fix for bug 969996

Delay chunk rendering by grouping chunks into larger
sets before calling renderChunk.  First set size will
be the same as the current FIRST_CHUNK_SIZE (6).  Subsequent
sets will cap at INCREMENTAL_RENDER_SIZE (60).

The goal is to reduce reflows on rendering the call log.

Also fixed the following bugs:
  _groupCounter never gets incremented if there's only one log entry per day
  Change currDate and prevDate comparison to more readable form

Added unit tests for call log rendering of various sizes.
Bug 962795 - Re-enable python e.me tests
Bug 974048 - Refine waits when connecting to a WiFi network
Bug 947617 - fixed clock hand transform to invoke the GPU
Bug 962177 - Ignore .git/ when packaging webapps
Bug 965912 - Time-zone and City change not visible in the FTU menu
STK DSDS - Cache multiple menus
STK DSDS - Showing multiple STK menu entries