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
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)
GPII-79: Updated production configuration for an overall config, flowManager and device reporter.
Integration with the SpiSettingHandler - high contrast
Merge pull request #72 from yzen/GPII-79

GPII-79: Updated production configuration for an overall config, flowMan...
Added basic Maavis settings
Merge branch 'GPII-77' into GPII-91
GPII-91: Fixed merge conflict.
GPII-76: Reverting commented out context.window.
GPII-91: Fixed merge conflict.
GPII-76: Fixed lifecycle manager tests.
GPII-76: Fixed match maker tests.