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
Updated from main respository/master
Merge remote-tracking branch 'origin/GPII-73' into GPII-73