Bug 829638 - GridManager.getApps() does not return bookmarks [r=ranbena]
Merge pull request #7618 from crdlc/bug-829638-v2

Bug 829638 - GridManager.getApps() does not return bookmarks [r=ranbena]
Bug 828574 - on lockscreen, use two lines for "Emergency calls only" when necessary
Merge pull request #7494 from fabi1cazenave/lockscreen-split-emergencyCall-message

Bug 828574 - on lockscreen, use two lines for "Emergency calls only" when necessary, r=timdream, a=21
Fixes Bug 828251 and also swaps in a brand sanctioned default favicon.
Merge pull request #92 from PeterLa/828251pla

Bug 828251 - Unbranded Version of the OS needs approved graphics