Bug 824690 - [Call log] If a contact has two phone numbers with the same type and carrier it is not possible to distinguish them on the call log.
bug 827778 - copy shared/resources/languages-*.json to locales/, with underscores
Bug 814441 - Email text has no formatting applied. a=BerlinWW, r=asuth.
Bug 828219 - Add delay to geolocation prompt and use watchPosition to avoid multiple prompts
Bug 827797 - used border instead of box-shadow with dark red
Bug 827795 - removed green color of text when type right passcode
Bug 812534 Enlarge touch targets for email to be the entire visible area.
Bug 825146 - Using touch instead mouse events (and not repainting anymore) in contact's photo r=basiclines
[Bug 828905] Fix home button while selectig more shortcuts [r=crdlc]
Bug 826465 - [SMS] Selecting contact created directly with the API without 'type' shows null for carrier r=fcampo
Bug 813009 Render initial splash messages for costcontrol.

- Implements widget message in notifications areat .
- Implements initial splash page when opening app for first time.
Merge pull request #7454 from KevinGrandon/bug_813009_cost_control_widget

Bug 813009 Render initial splash messages for costcontrol.
Merged because bb+ and r+
Merge pull request #7485 from EverythingMe/bugfix-home-while-more-shortcuts

[Bug 828905] Fix home button while selectig more shortcuts [r=crdlc]
Bug 824954 - do not restart the lockscreen when switching locale, r=timdream
Merge pull request #7486 from borjasalguero/bug_826465

Bug 826465 - [SMS] Selecting contact created directly with the API witho...
bug 825712 - let notification title occupies minimal height
Merge pull request #7495 from evelynhung/issue-825712

bug 825712 - let notification title occupies minimal height, r=timdream, a=blocking-basecamp
Merge pull request #7347 from gtorodelvalle/dialer-bug-824690-contact-with-same-number-type-and-carrier

Bug 824690 - [Call log] If a contact has two phone numbers with the same type and carrier it is not possible to distinguish them on the call log
Bug 828311 - forgot to push typo fix =/ caused regression
Merge pull request #7496 from lightsofapollo/bug-828311-regression-fix

Bug 828311 - forgot to push typo fix =/ caused regression