Bug 930104 - Add SIMULATOR=1 to prevent shipping firefox addons in simulator profile
Bug 919370 - [Test][Keyboard] Unit test for Pinyin IME

- also modified the latin and suggest unit test to prevent the conflict of global variables
Bug 911701 - Show data signal strength when connecting to EVDO
Bug 924475 - [Messages] The context menu is missing the contact name and mobile type r=borja

Do not output a header if this is a known contact
Merge pull request #13354 from julienw/924475-master-fix

Bug 924475 - [Messages] The context menu is missing the contact name and...
Bug 935041 - Investigate test_sms_add_contact failure, resolve and re-enable the test
Merge pull request #13388 from zacc/bug_935041

Bug 935041 - Investigate test_sms_add_contact failure, resolve and re-en...
Bug 934768 - [e.me] API key change for v1.2 [r=crdlc]
Add truncation to avoid MMS filename limitation r=rwaldron
Merge pull request #13300 from davidflanagan/bug915001hd

Bug 915001 - save edited images using tiles and display a progress bar r=hshih(cherry picked from commit d19550e2fb7331d5e4a54e8e998753378e7fd44a)

Conflicts:

	apps/gallery/index.html
	apps/gallery/js/ImageEditor.js

fix lint
bug 935052 - fall back to top-most frame after closing call in dialer tests
Merge pull request #13393 from davidflanagan/bug915001

Merge pull request #13300 from davidflanagan/bug915001hd
Merge pull request #13387 from zacc/bug_935052_phone

bug 935052 - fall back to top-most frame after closing call in dialer te...
Merge pull request #13369 from EverythingMe/v1.2-apikey

Bug 934768 - [e.me] API key change for v1.2 [r=crdlc]
Bug 917367 - No notification visible indicator implemented for when getUserMedia audio is active
Merge pull request #13222 from luke-chang/919370_unit_test_for_pinyin

Bug 919370 - [Test][Keyboard] Unit test for Pinyin IME, r=rudylu
Merge pull request #13051 from gasolin/issue-917367

Bug 917367 - No notification visible indicator implemented for when getU..., r=alive
Bug 935350 - Rename 'keyboard' role in homescreen, +shepherd
Merge pull request #13410 from timdream/keyboard-rename-followup

Bug 935350 - Rename 'keyboard' role in homescreen, r=rudyl
Merge pull request #13375 from crh0716/911701_1

Bug 911701 - Show data signal strength when connecting to EVDO r=alive