Bug 957497 - Allow include of uncompressed data files in the package
  apps (for v1.3t)
Bug 958470 - [Ringtones] set ringer type to the ringtones player
Merge pull request #17231 from dominickuo/v1.3-bug-958470-new

Bug 958470 - [Ringtones] set ringer type to the ringtones player, r=jimporter
Bug 809031 - OOP <iframe> content disappear if placed below 147px inside the system. r=salva

Conflicts:

	build/jshint/xfail.list
Merge pull request #17087 from etiennesegonzac/bug-980984-incoming-alert-from-system

Bug 980984 - Alert the user of an incoming from the system app to improve performance r=alive, rik
(cherry picked from commit 5aa7d6e424c46c2a9761ec85a016f39de3105d71)

Conflicts:
	apps/communications/dialer/test/unit/calls_handler_test.js
	apps/system/index.html
	apps/system/js/bootstrap.js
	apps/system/manifest.webapp
	apps/system/test/unit/bootstrap_test.js
Merge pull request #17249 from etiennesegonzac/bug-980984-1.3t

Merge pull request #17087 from etiennesegonzac/bug-980984-incoming-alert...
Merge pull request #17129 from etiennesegonzac/bug-981468-callgroup-keypad

Bug 981468 - Fixing JS erros occuring while using the keypad during a conference call. r=ferjm
Merge branch 'v1.3' into v1.3t
Merge pull request #17240 from sprd-ffos/v1.3t

Bug 809031 - OOP <iframe> content disappear if placed below 147px inside...
Bug 979341 - Error page displayed in Cost Control FTU, after setting Data usage limit
Merge pull request #17265 from sprd-ffos/v1.3t

Bug 979341 - Error page displayed in Cost Control FTU, after setting Dat...
Bug 980672 - [B2G][Cost Control] Disabling Data use alert does not deactivate Limit picker
Merge pull request #17266 from sprd-ffos/v1.3t

Bug 980672 - [B2G][Cost Control] Disabling Data use alert does not deact...
Bug 959659 - Fix an issue that prevented the last file in a directory from being recompressed
Bug 959659 - Recompress all the PNG assets of the bluetooth app
Bug 959659 - Recompress all the PNG assets of the browser app
Bug 959659 - Recompress all the PNG assets of the calendar app
Bug 959659 - Recompress all the PNG assets of the camera app
Bug 959659 - Recompress all the PNG assets of the clock app
Merge pull request #17218 from evelynhung/issue-957497-v1.3t

Bug 957497 - Allow include of uncompressed data files in the package apps (for v1.3t), r=yurenju