Files required for Sociable Solution
GPII-307: Transformations and updated acceptance tests for NVDA entry
GPII-251: Updates solution registry, inverse rules and relevant preferences set to have invertColours instead of images for the windows magnifier. Note that invertImages is still a common term and is supported by the easit application
GPII-369: Adding solutions registry entry for Java Mobile/Symbian

* Adding entry into the web solutions registry
* Adding an example N&P set, os_jme
GPII-304: Adding transformations for available common terms

* fontSize
* highContrastTheme
* volume
* language
Merge branch 'master' of https://github.com/GPII/universal into GPII-304
GPII-304: Adding N&P example set with common terms for JME
GPII-331: Added solutions registry entry, device reporter entry and preference sets for eCmobile and eCtouch (same files for both applications)
Added scaling for fontSize to conform to common term default value and value range
GPII-304: Using quantize to transform the font size
GPII-304: Updating the 'language' common term reference
Merge remote-tracking branch 'upstream/master'

Conflicts:
	testData/deviceReporter/installedSolutions.json
	testData/deviceReporter/win32_installedSolutions.json
	testData/solutions/win32.json
Deleted sociablejson
Sociable Solution update

Sociable Solution is up to date for the current version of the
architecture
GPII-270: added match maker proxy and the configuration for integrating with external multiple matchmakers.
GPII-270: added flat match maker as a default for a match maker proxy. Updated pref set example to have matchMakerType specified as the common term. Fixed a bug in lcm and inlcuded the lca module in base config.
GPII-270: improved the proxy match handler.
GPII-363: Removed all entries for UI options from NP sets, solution registry and device reporter data
Merge branch 'master' into GPII-270

Conflicts:
	gpii/node_modules/lifecycleManager/configs/base.json
GPII-270: added tests for proxy.