Bug 898792 - [Dialer] - The bottom buttons are not the same height
Bug 903477 - [Bluetooth] Bluetooth icons inner shadow is too dark - tone down
Bug 903137 - [SMS][MMS] Contextmenu prompt for email in message should display email address r=gnarf

- Make all prompts consistent
- Ensures that dataset.isContact strings are only used to derive a true isContact boolean
- Renames ThreadUI.activateContact to ThreadUI.prompt
    - The function no longer serves as only a "contact" prompt
    - May prompt any type of recipient (contact, unknown, email)
    - May prompt from header, group list or message content
- Renames ThreadUI.genPrompt to ThreadUI.prompContact
    - genPrompt is meaningless
    - The function is explicitly for creating a prompt with a known contact
    - Includes the contact info lookup
- Converts promptContact arguments to an object, instead of named parameters
- Update LinkActionHandler to delegate to promptContact, instead of doing it's own duplicated lookup
- Adds tests to ensure that a something is displayed when something is provided
    - Could be any of the following:
      - DOM UL
      - Email address
      - Phone Number
      - Name
- Updates LinkActionHandler tests to use the correct new function names

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 903365 - [Settings][HD] Settings icons inner shadow is too dark - tone down
music2: ux redesign

Conflicts:
	test_apps/music2/style/css/style.css
Bug 903521 - Camera not working in gaia when run in Firefox
Merge pull request #11470 from hotzenklotz/903521_camera_in_FF

Bug 903521 - Camera not working in gaia when run in Firefox r=kgrandon
Merge pull request #11468 from es92/music2uxUpdate

Music2 UX update
Bug 902549 - [B2G][l10n][Email] Double @@ signs in the second keyboard layer
Bug 903260 - [SMS][MMS] SettingsURL value is never used in sms/js/notification.js: Ringtones BROKEN

https://bugzilla.mozilla.org/show_bug.cgi?id=903260

- Make the mock's set method behave enough like the real thing to write a correct test
- Assign the result of the call to set(…) to the actual local setting
- Tests
    - Ensure that the src property is as expected

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 903260 fixes tests, a=test-only

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 901458 - [Buri][Settings]The interface display abnormal when input PIN code
Bug 898262 - HD: [CostControl] canvas and wifi/3g checkboxs not use screen space well
Merge pull request #11396 from gasolin/issue-898262

Bug 898262 - HD: [CostControl] canvas and wifi/3g checkboxs not use scre..., r=lodr
Merge pull request #11465 from littleq0903/bug-902649-2

Bug 902549 - [B2G][l10n][Email] Double @@ signs in the second keyboard layer. r=rudylu
bug 902402: add -L argument to find command to follow symbolic for apps
Merge pull request #11476 from yurenju/902402

bug 902402: add -L argument to find command to follow symbolic for apps r=@timdream
Merge pull request #11204 from pivanov/bug-898792

Bug 898792 - [Dialer] - The bottom buttons are not the same height r=samjoch
Merge pull request #11458 from pivanov/bug-903365

Bug 903365 - [Settings][HD] Settings icons inner shadow is too dark - tone down r=samjoch
Merge pull request #11461 from pivanov/bug-903477

Bug 903477 - [Bluetooth] Bluetooth icons inner shadow is too dark - tone down r=samjoch