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-32: Implemented array transformation one way; array->hash and added simple test
GPII-32: Minor improvements re antranigs comments on IRC
GPII-32: Fixed unecessary fluid.get call
GPII-32: First version of reverse transformations implementation.. still some issues I need to discuss with the smarter people
GPII-32: Now working with nested arrays as well, and generally any arbitrary expander put under the options.innerValue section of the rules.. Added a few tests as well.. needs to be cleaned up a bit, linted, etc
GPII-32: Merging latest changes from master in

Merge remote-tracking branch 'origin/master' into GPII-32-2
GPII-36: Made some minor fixes to the transformation functions. XMLHandler.set now working
GPII-36: Now allows setting settings that weren't already defined, ensured all tests are running again, moved transformation functions to beginning of the file (these might be general purpose enough that we want them elsewhere), and JSLinted the files
GPII-32: Fixed all comments from antranig+colin review, except for using fluid.set when creating paths and renaming the hashToArray function
GPII-32: Cleaned up tests as suggested by antranig
GPII-32: Renamed hashToArray function back to original