Merge branch 'lifecycleManager'
Merge branch 'umaster'
Fixed configs to have proper prefixes.
Merge remote-tracking branch 'kaspermarkus/colinmerge'

* kaspermarkus/colinmerge: (22 commits)
  Changed solutions registry to use the exec action for launching and killing the magnifier. It would probably have been preferable to use the gsettings bridge, but since all the actions have to be defined in the LifecycleActions.js to work, and the gsettings is platform specific I wasn't sure how to go about this.. The other option was to just put it in the settings handler, but this wasn't as straight forward either, since firing and setting the magnifier uses two different schemas - hence it would require a new block in the settings handler (which shouldn't be a problem), but adding to this that it's not the prettiest of solutions to have to specify 'screen-magnifier-enabled': true in the profile, I figured the exec solution was as good as any
  fixed small typo in andreis profile
  Added enabled setting to transformation map for GNOME magnifier.
  Removing attempts to use settings handler as lifecycle handler in favour of plain old settings.
  JSON-compliant escaping rules. KASPAR WAS RIGHT!
  Payload tweaks to get us closer to a working system.
  Renamed "settingsTransformationMap back to the old name of capabilitiesTransformations for the demo.
  Fixed dot escaping in RWG solution registry entry.
  Fixed a bug in all the payloads with UIOptions to wrap the application specific settings in an array
  Removed the unimplemented solutions from the solution registry + profile.. Did a few updates according to antranigs new awesome lifecycle handlers
  Went through all the solutions and ensured that they now have the settingsTransformationMap instead of capabilities.. Fixed some minor errors in different places
  Added RWG for the relevant personas
  * Changed gnome screenreader aname and id to include ORCA\n*Added RWGold to solution registry\n*Changed all lifecycleHandler entries to lifecycleManager
  Added user profiles for all personas except Chan... RWG and Android stuff still missing from the profiles.. Also fixed some minor errors in solution registry
  Renamed user profiles to include names of personas... Also fixed a small typo in the solutions registry
  Added user who needs magnifier
  Bad kasper! Forgot to lint json
  Added UIOptions settings to the profile... Note that the applications block is called applications with an 's'
  ... actually managed to add the file this time
  added a single profile for font-size
  ...
Merge remote-tracking branch 'yzen/master'

* yzen/master:
  Fixed configs to have proper prefixes.
Merge remote-tracking branch 'kaspermarkus/master'

* kaspermarkus/master:
  NVDA working now. Also updated the RWG payload for Andrei to work with RWG
  updated nisha's profile to work with RWG and yura's new no-op settings handler. Also edited the solutions registry to have windows onscreen keyboard use the no-op handler
  Made a pass at RWG.. It can currently set the settings and launch RWG, as well as kill RWG again.. But there is a bug somewhere (perhaps in the xml-mapping) that means that the correct values are not correctly written on restoring of settings... I think it might be a synchrony issue happening in line 89
  Added resolving of the settingshandler part of the solution data
  First sketch of firefox exec and empty settings handler
  Updated XML Settings handler+test to now accept the new settingshandler payloads (without the surrounding array)
  Carlas magnifier in windows now both launching and shutting down properly. Started work on RWG - the solution registry entry now uses environment variables instead of static paths
  Updated the windows solutions to have the correct id and version. Also fixed up carla's profile
updated carlas profile to work in RWG.
Tweaks to "no settings" settings handler code from yura.
Merge remote-tracking branch 'upstream/master'
Fixed name in the index.js to reflect the namechange of the nosettingshandler