Bug 949016 - [music] include the missing css file in open.html
Bug-951287 Multiline quoted encoding elemnets in vcard files
Bug 951072 - [Clock] Text alignment issue in alarm list; r=reviews
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 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 948826, add prompt testing

clone uitests into uitests-privileged and set it as a privileged app

test
 - contacts
 - geolocation
 - device-storage
 - userMedia

remove unnecessary part in uitests-privielged
skip on desktop because there's no microphone available
Bug 960039 - [system] Remove `charging` attribute

Remove unused, non-standard `charging` attribute from the markup for the
battery icon.
Xfail test_sms_with_attachments with the new bug
Bug 938540 - Use Notification API for WapPush
Bug 931711 - mozContact constructor creates unconsistent objects with the 'undefined' string as 'id'
Bug 943812 - Remove "R$" from English keyboard layout.
bug 958318 - Optimize Settings App to find homescreen counts r=arthurcc
Bug 956648 - Update test-agent version