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
Added basic Maavis settings
Corrected .name -> .id in solution capabilities. Also added restor settings
Updated ethel and bert user profiles for Pilots
Merge branch 'master' of github.com:GPII/universal
Merge branch 'master' of git://github.com/rgardler/universal
removed wookie from installed solutions
need to match by id and use non debug version of maavis
converted profiles to new flat structure
fixed merge clash casued by pull from rgardler/universal
Added Ross' old settings handler as a comment from future reference
correct mising chars from berts profile