Bug 942909 - Add in the gaia test cleanUp() a option to setup prefs r=davehunt bsilvergberg
Reduce locators, settings app
Bug 949016 - [music] include the missing css file in open.html
Bug-951287 Multiline quoted encoding elemnets in vcard files
Bug 951095 - [Clock] Increase font-size of counting value in Stopwatch; r=reviews
Bug 951072 - [Clock] Text alignment issue in alarm list; r=reviews
Bug 956169 - Unit tests for shiftkey.js and doublespace.js
Bug 950821 - Add comment clarifying 'undefined' check
Bug 958681 - [B2G][Gaia][Gallery] When a corrupt image is placed on the device the gallery app can appear to continue loading indefinitely with no warning.
[Bug 951972] [music] cannot change progress bar after long tapping on "Random Play" icon
Bug 959543 - [CostControl] Remove reference to lastSIM property
Bug 959175 - Force redraw on uppercase switch when layout has secondLayout flag
Bug 957122 - Enable more TBPL tests - Settings app

Enable test_settings_app_permissions on TBPL
Bug 957990 - Reduce length of subject and body for test_send_xxx_email tests
Bug 957122 - Enable more TBPL tests - Lockscreen

Enable test_lockscreen_wake_with_notification on TBPL

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/tbpl-manifest.ini
Bug 960170 - [Calendar][Integration Test] use chai.assert instead of regular assert for better error messages
Bug 946205 - Re-enable Travis tests after 891882 merged
Bug 960290 - email: possible to trigger off-screen compose button
Bug 930108 - Adjust padding
Bug 849223 - Adding default values for the gaia.ui.* theming settings
r=vingtetun