Changed the matchmaker to only fire up solutions for which the solutions have a solution block for
Merge remote-tracking branch 'upstream/master'
Added android settings to relevant user profiles
merge jsonSettings back in and put all changes for maavis back (which were removed in the jsonSettings branch
configure various users for testing purposes
use the dev version of maavis rather than the distribution version - faster development cycle
add a new test user for the new dementia theme
Merge branch 'maavis'
Merge remote-tracking branch 'upstream/master'
GPII-71: JSON settings handler now supports deep objects via el paths
GPII-71: Fixed some minor issues with set and ensured that it will run properly with ORCA
GPII-71: JSLinted and cleaned up tests a bit
Updated from main respository/master
GPII-73: Added ini module
GPII-73: Modified ini module to allow # comments when specified in parameter
GPII-77, GPII-51: Updated to latest version of qunit and harmonised with Infusion's implementation of jqUnit for both browser-based and node-based tests (FLUID-4886). Resolved issue with successive sequential tests and introduced IoC-based testing system for use in node environment (FLUID-4850)
Add support for some specific GNOME solutions

This patch includes the support to deal with these following gsettings
schemas:
  - org.gnome.shell.overrides
  - org.gnome.desktop.wm.preferences
Integration with the SpiSettingHandler - high contrast
GPII-83: Added the common terms that will be used for pilots to the ontologies
Merge remote-tracking branch 'amb26/GPII-77' into GPII-73-2