Bug 964173 - [Messages] Remove the css animation 'peek' hack r=julien
Bug 962451 - [email] Start from activity, tap back from compose/message reader, empty message list
Bug 930440 - [Messages] Urls in a message are not highlighted when tapping on them r=julien
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
Bug 964584: Convert vorbis files to opus to improve memory usage.
Bug 957932 - Add coverage checkbox for test-agent web interface
Merge pull request #15588 from crh0716/944601

Bug 944601 - Use getCardLockRetryCount properly r=evelyn
Merge pull request #15580 from crh0716/959971

Bug 959971 - Allows -1 as a valid retry count r=evelyn
Bug 913782 - [Keyboard] Build time default keyboard selection work for
3rd-party keyboard support
 - make build/settings.js read the default keyboard layout config

Bug 920431 - [keyboard] keyboard_layout.json should be customizable
  - Refine to make it adopt the config in distribution package
Bug 950080 - add jsdoc generator to gaia
Revert "Bug 950185 - [B2G] [Settings] Network type does not show user friendly options such as 2G and 3G"

This reverts commit 446944851369aa59012e996de21232800a8db1c3.
Bug 950185 - [B2G] [Settings] Network type does not show user friendly options such as 2G and 3G
Merge pull request #15704 from anefzaoui/missing-ar-char

Bug 926084 - [AR] Missing Arabic character in keyboard - Needs reorganization and using "alt" option.
r=rudylu
Merge pull request #15410 from RudyLu/keyboard/Bug920431-keyboard_layout_customize

Bug 920431 - [keyboard] keyboard_layout.json should be customizable.
r=yurenju
Revert "Bug 936398 - [Settings] Title wordings"

This reverts commit 5a4216f4a8afa3a371f1411310a01b112677dc51.
Merge pull request #15748 from wanderview/ogg-to-opus

Bug 964584: Convert vorbis files to opus to improve memory usage. r=timdream