Bug 916046 - Find duplicates button needs an icon
Bug 917207 - Create a system region for cards view and migrate tests to use it
Bug 917586 - Use newer version of screen reader simulator in desktop firefox.
Merge pull request #12282 from eeejay/bug-917586

Bug 917586 - Use newer version of screen reader simulator in desktop firefox. r=kgrandon
Merge pull request #12265 from anah/gaia_ui_tests_bug_917207

Bug 917207 - Create a system region for cards view and migrate tests to use it
bug 891724

Add ability to customize Support Contacts via variant json files.

r=qDot
Merge pull request #12323 from nullaus/891724-supportcontactcustomization

bug 891724
Revert "Merge pull request #12323 from nullaus/891724-supportcontactcustomization"

This reverts commit dce497b5cf19183f51a867334dd0524c816493dc, reversing
changes made to 432a79aedb558d998ea88c04d43427a2082a67ee.
bug 891724

Add ability to customize support contacts in Settings App, with unit test fixes.

r=qDot
Merge pull request #12326 from nullaus/891724-supportcontactcustomization

891724 supportcontactcustomization
Bug 905856: support for forward locked wallpaper, ringtones and songs
Merge pull request #11914 from davidflanagan/bug905856

Bug 905856: support locked media files r=johu,dkuo,hsivonen,kaze
Merge pull request #12319 from rnowm/916046

Bug 916046 - Find duplicates button needs an icon
Bug 885713 - propose a "make hint" that would use jshint instead of gjslint

This adds
* a default .jshintrc configuration file
* a `make hint` launcher
* a way to launch the linters (including the old lint linter) for a specific app
  only.
* you can also use another jshint configuration file
Follow-ups:

* use npm to install jshint
* simplify the jshint command line, now that I checked that current jshint does
  not choke on our files
* use .jshintignore file as main exclude file, from both gjslint and jshint
Follow-ups:

* fix paste call in MacOS X
* pre-commit change
* remove node_modules from .PHONY because I don't want to always run this,
  especially when I'm offline
* remove the node_modules directory in really_clean