Bug 1021051 - Merge all after app-makefile js target into a single one. r=yurenju
Bug 1020091 - ensuring that the search entry has a correct DOM order within the e.me app.
Bug 1018340 - Make gaia-header edit mode exclusively visible.
Bug 1020685: Close only over the URL string that we need. r=bfrancis
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 1019970 - Clean up connstate l10n
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 1014955 - [Camera] Migrate v1.3T downsampling patches to v1.4/master
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 973557 -[CostControl][FTU] Update button active while is updating information
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