Bug 949016 - [music] include the missing css file in open.html
Bug 951563 - CSS fix for the 5th row of app label on WVGA resolution.
Bug-951287 Multiline quoted encoding elemnets in vcard files
Bug 951072 - [Clock] Text alignment issue in alarm list; r=reviews
Bug 957100 - [Settings] add marionette for b2g-improve and feedback page
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 959204: correct varible name in PowerDataRun; r=huseby
Bug 958555 - Accesing the Camera app from the Message app using marionette, causes the Camera app to become unresponsive
[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 947504 - Only enable HwcComposer2D by default if hardware support it
Bug 958146 - [Camera] fxos specific APIs need to be mocked in order to renable some of the unit tests
Bug 957122 - Enable more TBPL tests - Settings app

Enable test_settings_app_permissions on TBPL
Bug 957122 - Enable more TBPL tests - System app

Enable test_context_menu_activity_picker on TBPL
Bug 952164 - [B2G][Camera] Camera on lock screen allows user to take picture after clicking thumbnail preview despite no camera button being present
Bug 959043 - Fix Software Home Button on Nexus4
Bug 956428 - Add checks on set/getPreferredNetworkType
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