Bug 1018233: Missing list item closing tag.  r=vingtetun
Bug 1025331 - [FTE] Change the "Next" button to "Skip" on the Firefox Accounts screen during FTE
Bug 1064228 - Make settings api test functions wait on transaction
Bug 1061532 - Only set the category of a newly apn item to custom when restoring from a custom apn setting
Bug 1065018 - [camera] Focus ring is not always aligned
Fixes Bug 1061577, clears blocker for jshint in tests folder.
Bug 1063311 - [Contacts] Warning page does not work when tap email in user contact
Basically reverts f695792496326679702a0b2f48a9c384fd47473a
Bug 1065421 - Add theme color to clock
Bug 1064630 - [Lockscreen] Locking device after entering a passcode leaves the user in an unrecoverable state
Bug 1059713 - [Settings] The string in the alert msg should be changed from "SD Card" to "Internal storage"
Bug 1061858 - [Cost Control][Usage app] Usage app disables Wifi tracking after exiting/launching Usage app
Bug 1065286 - [NFC] TNF_RESERVED usage removal, r=gweng
Revert "Bug 1052241 - Disable network activity icon in DEBUG mode"

This reverts commit bcc84b7dcb3be974ca7a329f1aa63c9cfb1c4f91.

Conflicts:
	apps/system/js/statusbar.js
Bug 1063310 - [email] When sending multiple attachments, all but the first are sent as zero-byte attachments. r=asuth
Bug 958041 - [DSDS] When unlock SIM PIN in FTE, due to device hasn't camped on network yet, the next SIM manager page will show "No operator" under the SIM.
Bug 1066045 - [v2.2][v2.1] Rapidly tapping record after switching from picture to camera mode will take photo instead of video
Bug 1063305 - NFC icon disappear after reboot
Bug 1011584 - Bangladeshi Mobile Network's APN is not available in settings. r=jaoo
Bug 1059106 - [settings] move root panel airplane mode item into panels/root
Bug 1063406 - [RTL] USB Storage status (e.g. Enabled/Disabled) is not correctly placed in RTL