bug 918143
-check for existing notification with same tag before inserting a new notification on lockscreen.
-add marionette tests for lockscreen notifications.

r=qDot
Bug 910707 - add css mediaquery condition for dock footer display; fix software home button display on Nexus4
Bug 918998 - Hide email info in notification bar when there is only one configured account. Show email info when there are one more accounts.
Bug 928801 - [settings] Should use the term 'EVDO', 'CDMA' for CDMA network modes
Bug 928169 - [B2G][Homescreen][Dock] Installing too many apps places icons behind dock UI
Bug 923574 - Ensure manifest size is valid

When installing an application with an invalid/undefined size, the new
WebIDL is not happy about this and the notification stays forever. We
fix this by checking that the size is effectively defined before setting
the max value of the notification.
Bug 928834 - Python - Change the timing of the base select wrapper to resolve test failure in clock app
Bug 928864 - Reenable python ui test test_gallery_delete_image.py , Marionette modal dialog handling repaired
Merge pull request #12964 from gasolin/issue-928801

Bug 928801 - [settings] Should use the term 'EVDO', 'CDMA' for CDMA netw..., r=arthur
Bug 928866: Fix contacts email import for type array.
Merge pull request #12932 from crdlc/bug-928169

Bug 928169 - [B2G][Homescreen][Dock] Installing too many apps places icons behind dock UI
Merge pull request #12601 from cctuan/910707

Bug 910707 - Bottom toolbar not visible on Nexus 4
Bug 928875: Fix google import for webidl mozContacts.
Bug 928885 - xfail test_import_contacts_from_sim because
Merge pull request #12973 from AlinT/xfail_test_import_from_sim

Bug 928885 - xfail test_import_contacts_from_sim because
Merge pull request #12968 from zacc/bug_928834

Bug 928834 - Python - Change the timing of the base select wrapper to re...
Merge pull request #12969 from zacc/bug_928864

Bug 928864 - Reenable python ui test test_gallery_delete_image.py , Mari...
Merge pull request #12916 from lissyx/bug923574

Bug 923574 - Ensure manifest size is valid r=etienne
Merge pull request #12972 from wanderview/contacts-webidl-google

Bug 928875: Fix google import for webidl mozContacts.  r=arcturus
Merge pull request #12970 from wanderview/contacts-merger-email-type

Bug 928866: Fix contacts email import for type array.  r=arcturus