Merge pull request #10458 from Rik/disable-travis

Bug 884217 - Disable travis on v1.1.0hd r=yurenju(cherry picked from commit 48c005e720aaf810edc5d67ac2aa983dbbca47e1)
Bug 881127 - Support GAIA_DEV_PIXELS_PRE_PX for devices with different screen pixel density
Merge pull request #10499 from yurenju/ratio-v1.1.0hd

Bug 881127 - Support GAIA_DEV_PIXELS_PRE_PX for devices with different s... r=timdream
Merge remote-tracking branch 'origin/v1-train' into v1.1.0hd
Merge pull request #10229 from lightsofapollo/hide-loading-area

Bug 876796 - Hide event details until they are loaded.
Merge pull request #10408 from mcirlanaru/bug_881904

Bug 881904 - [Contacts] Use the text normalizer from shared/js, r=@albertopq(cherry picked from commit 9b3cf4d68c2097c6060c3e76c0194c0e115411b7)

Conflicts:

	apps/communications/contacts/js/contacts.js
	apps/communications/contacts/js/fb/friends_list.js
	apps/communications/contacts/js/utilities/normalizer.js
	apps/communications/contacts/test/unit/contacts_list_test.js
	apps/communications/contacts/test/unit/link_test.js
Bug 852836 - Flip front camera preview to correct direction
Merge pull request #10558 from rexboy7/fix-bug852836-v1.1.0hd

Bug 852836 - Flip front camera preview to correct direction
Bug 883737 - [Bluetooth][File-Transfer] screen layout size is exceeded in Bluetooth Transfer pop-up screen
Merge pull request #10565 from ian-liu/v1_train/Bug883737_screen_layout_size_is_exceeded_in_pop_up_dialog

Bug 883737 - [Bluetooth][File-Transfer] screen layout size is exceeded in Bluetooth Transfer pop-up screen(v1-train), r=@alivedise
Merge pull request #10340 from jaoo/882089

Bug 882089 - Automatic channel configuration for 1.1/DT PL, r=kaze(cherry picked from commit d8df0e4e27d1822f3607e3b2582df318ec653a7f)

Conflicts:
	shared/resources/apn/apns_conf_local.xml
Merge pull request #10340 from jaoo/882089

Bug 882089 - Automatic channel configuration for 1.1/DT PL, r=kaze(cherry picked from commit d8df0e4e27d1822f3607e3b2582df318ec653a7f)

Conflicts:
	shared/resources/apn/apns_conf_local.xml
Bug 882095 - Restart the connection only when APN related settings changed(cherry picked from commit 2af068e72bcda7fa37b2bcd00de4d78f999370f9)
Merge branch 'issue-853349' of git://github.com/gasolin/gaia into gasolin-issue-853349

Conflicts:
	apps/camera/js/camera.js
Merge pull request #10304 from jedp/get-rp-tests

Bug 881435 - UI Tests for navigator.mozId.get(); r=ferjm

(cherry picked from commit 278d090ceada5ac7ab0519116cd23a3f2be42267)

Conflicts:
	test_apps/uitest/index.html
Merge pull request #10585 from jedp/get-rp-tests-v1-train

Bug 881435 - UI Tests for navigator.mozId.get(); r=ferjm
Merge pull request #10535 from AntonioMA/master

Bug 885682: Allow including preference files from GAIA_DISTRIBUTION_DIR r=ochameau
(cherry picked from commit d9f163c5eb3ba97b08b1009b9b6e2b53d09ae776)
Merge pull request #10287 from crdlc/bug-877889-v2

Bug 877889 - JavaScript Error: TypeError: nextCard is null or TypeError:...
(cherry picked from commit 7e6abee2fc509e3030ce831e6418893d61c9c4b9)
Bug 883813 - [SMS][Translation][Spanish][Portugues] Some tokens are not translated r=julienw

In order to support a variable width of the "To:" field in the
Recipients section, some restructuring is necessary.

(cherry picked from commit 4b1359c18031b20eac667952a9e50b3729fbaa9e)
Merge pull request #10506 from fabi1cazenave/simpleLocalize-bug882591

Bug 882591 - l10n.js should expose an asynchronous `localize()' method, r=timdream
(cherry picked from commit f8efe1a25aeaa7fd5443ba2bf2a823f7dc266864)