Bug 932542 - vbump marionette apps to 0.3.1 +shepherd
Disable calendar create event integration test
Merge pull request #13202 from lightsofapollo/v1.2-fix-app-clos

Bug 932542 - vbump marionette apps to 0.3.1 +shepherd
Bug 917044 - Run gjslint, unit tests and integration tests in parallel
Merge pull request #13204 from lightsofapollo/enable-parallel-v1.2

Bug 917044 - Run gjslint, unit tests and integration tests in parallel
Bug 916305 - Gaia ui test travis setup
Bug 928631: support sym linked b2g in gaia-ui-test
Merge pull request #13205 from lightsofapollo/v1.2-gaia-ui-tests-travis

V1.2 gaia ui tests travis
Bug 927642 - Fix dir/lang integration tests for notifications
Merge pull request #13103 from davidflanagan/bug923544

Bug 923544: remove unneeded workaround that was causing problems r=aus(cherry picked from commit 8db3fca246d8ba79a8bdd9998f5e12ed11533fea)

Conflicts:

	apps/settings/js/sound.js
Merge pull request #13235 from davidflanagan/bug923544-v1.2

Merge pull request #13103 from davidflanagan/bug923544
Merge pull request #12949 from qdot/927642-1.2-more-tests

Bug 927642 - Readd integration tests for notification lang/direction in gaia
Merge pull request #13106 from davidflanagan/autocorrect-config2

Bug 884752: make keyboard layouts and autocorrect dictionaries configurable at build time r=rlu,yurneju,pike(cherry picked from commit 9b0ea7a308cc99fb389e503c63dc7792692247c9)

Conflicts:

	Makefile
	apps/keyboard/js/layout.js
Merge pull request #13240 from davidflanagan/bug884752-v1.2

Merge pull request #13106 from davidflanagan/autocorrect-config2
bug 925970

* Final round of alignment changes. Unfortunately no time for anymore. It's as good as it's going to get for 1.2 and 1.3.

r=peterla
Merge pull request #13242 from nullaus/awesome-bar-ui

bug 925970
Bug 929785 - [Clock] Unable to scroll in Timer panel

Only certain UL elements should declared `overflow: auto`--those that
are explicitly intended to render with scrollbars when their content
exceeds their dimensions.

Other UL elements (i.e. the element that contains Timer settings in the
Timer panel) should not receive this declaration.

r=iliu
(cherry picked from commit 133814d71be018331c6e31fb954adfb6ef5a588b)

Conflicts:

	apps/clock/style/alarm.css
Revert "Revert "Merge pull request #12892 from comoyo/value_selector_inputcontext""

This reverts commit 276838e60f34b3ec251fe7e39d6b7ae2935144f1.
Merge pull request #13110 from RudyLu/keyboard/Bug925003_greekSMS_master_v1.2

Bug 925003 - Add a new keyboard layout, "Greek SMS" to allow sending mes...
r=djf, julienw (cherry picked from commit 50c5c530ffef00cb7b24d00e23cbed80210105d2)

Conflicts:
	apps/keyboard/js/layout.js
Bug 933181 - UnicodeDecodeError in XML report generation