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'
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