Merge remote-tracking branch 'upstream/master'
GPII-105: Integration with Windows
Changed setcursors.js to a fluid function in SpiSettingsHandler.js
Merge remote-tracking branch 'javihernandez/pilot' into pilot

* javihernandez/pilot:
  Adding 'es-ES' as a valid auditoryOutLanguage common term
Merge branch 'master' into GPII-105
Merge branch 'GPII-105'

* GPII-105:
  GPII-105: Integration with Windows Changed setcursors.js to a fluid function in SpiSettingsHandler.js
  Integration with Windows Lowercased all term names Fixed font size transformations Renamed Tracking to mouseTrailing Updated the preferences for roger
  Integration with Windows CursorSize: fixed the hardcoded path to the setcursors script
  Integration with Windows CursorSize: mapped all the remaining cursor images
  Integration with Windows FontSize is now properly mapped and working
  Integration with Windows CursorSize is now mapped and working
  Integration with spiSettingsHandler Now working with MOUSETRAILS FontSize is also mapped but is a bit buggy
  Integration with the SpiSettingHandler - high contrast
Pretty-printing of preferences logs

Added null filter and 4 spaces for pretty-printing the preferences logs.
"logs" now a variable instead of repeating the literal string x times.
Merge branch 'master' of github.com:GPII/universal into pilot
Merge remote-tracking branch 'cstrobbe/patch-1' into pilot

* cstrobbe/patch-1:
  Pretty-printing of preferences logs
GPII-107: Added missing parenthesis - things are now properly working again
Merge remote-tracking branch 'kaspermarkus/GPII-107' into pilot

* kaspermarkus/GPII-107:
  GPII-107: Added missing parenthesis - things are now properly working again
SP-35: Make it easier to see that a log comes from the rule-based matchmaker
SP-35: Make logs from statistical matchmaker easier to recognise
revised parenthesis
Merge remote-tracking branch 'cstrobbe/patch-2' into pilot

* cstrobbe/patch-2:
  SP-35: Make it easier to see that a log comes from the rule-based matchmaker
Merge remote-tracking branch 'cstrobbe/patch-3' into pilot

* cstrobbe/patch-3:
  SP-35: Make logs from statistical matchmaker easier to recognise
Merge remote-tracking branch 'Cloud4AllTUD/master' into pilot

* Cloud4AllTUD/master:
  revised parenthesis
SP-40: Added logging to the lifecycle manager as required by the pilot testing
pre log is now called before inverse transformations and application settings are no longer not deleted
final app-unique preferences are loged for all matchamkers
Fixed a couple of issues with the Statistical Matchmaker analysis module.