Bug 959971 - Allows -1 as a valid retry count
Bug 944601 - Use getCardLockRetryCount properly
Bug 959962 - Set correct width based on the padding
Bug 957338 - [Contacts] When viewing contact details from the Messages app (via Activity) the chat icon is not functional and not disabled either
Bug 939021 - [UITest][API] Fix and improve mozPay tests. r=zac
Bug 833438 - Viewing video through activity doesn't pause after headset is removed
Bug 963723 - On startup, software home button should not be enabled if home gesture is enabled.
[AR] Missing Arabic character in keyboard - Needs reorganization and using alt option
Bug 963503 - [NFC] Shrink UI Type Error in AppFrame in Shrinking_ui.js
Bug 948208 - Add black background on body before loadend
Bug 943343 - [Costcontrol] Not always is updated information about calls made and sms sent for the user
Bug 950803 - [B2G][Contacts]When tapping on the Search box after a successful Gmail contacts import, the on-device display is inappropriate
Bug 950142 - [B2G][Contacts]Imported Contacts Selection Screen from Gmail account displays inappropriate truncation and duplication text
Bug 947086 - [Dialer] Dialer may call CDMA-specific bluetooth functions on non-CDMA phone
Bug 962451 - [email] Start from activity, tap back from compose/message reader, empty message list
Revert "Bug 950080 - add grunt jsdoc generator to gaia"

This reverts commit 508f3b37a2ea0953d2817464f285ec1d8b08dd2e.

Conflicts:
	Gruntfile.js
	package.json
Merge pull request #15741 from gaye/backout-bug-9500080

Revert "Bug 950080 - add grunt jsdoc generator to gaia"
Revert "Bug 957932 - Add coverage checkbox for test-agent web interface"

This reverts commit 9270745f79b2c2195a13cb24902cb402b08ced06.
Merge pull request #15689 from russnicoletti/bug833438

Bug 833438 - Viewing video through activity doesn't pause after headset ..., r=johnhu
Merge pull request #15716 from timdream/background-color

Bug 948208 - Add black background on body before loadend, r=alive