Bug 1021051 - Merge all after app-makefile js target into a single one. r=yurenju
Bug 1022633 - Fix branding path in DEBUG=1 mode. r=yurenju
Bug 1020091 - ensuring that the search entry has a correct DOM order within the e.me app.
Bug 1020109 - Cell broadcast search list is not set correctly

The current code attempts to protect against empty objects incorrectly
since empty arrays are truthy in JavaScript. The result is empty objects
get passed to SettingsLock.set() which seems to break all subsequent
settings change observers.
Bug 1018340 - Make gaia-header edit mode exclusively visible.
Bug 996510 - Add system message test case for Bug 906164
Bug 1019220 - Settings Icons need improvements
Bug 1016233 - [Collections App] Collection UI styling
Bug 1017441 - [Gaia][Contacts] Contact screen scroll beyond 'A ~ Z-#' shows blank preview screen.
Bug 1019139 - Make switch element inline-block.
bug 982295 - Use new Browser API download method. r=benfrancis
Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info. r=fabrice

Conflicts:

	apps/system/test/unit/ftu_ping_test.js
Bug 1021237 - Make the edge zones higher in landscape mode.
Bug 977528 - [Contacts][Feature] Importers should give information of automated merged contacts
Bug 1021533 - (bug 1018836 follow up) css class cleanup.
Bug 1018335 - removeFocus() when the screen is locked
Bug 1020628 - Don't allow user to start activity twice in keyboard settings
Bug 1021578 - use "$(SEP)" instead of "/" for app-makefile-template
Bug 1015875 - OMA CP Settings not processed correctly, settings not active by default.
Bug 1021137 - added missing aria attributes the the lockscreen's passcode panel and media container. r=alive