Files required for Sociable Solution
GPII-115: added read write solutions and settings handlers that use the registry resolver.
GPII-115: Updated to the latest infusion at SHA:08f3b382d9d556c5c8d21b2f16e65851ed8a1c62
GPII-115: Added RWG id to capabilities block.
GPII-115: Updated path for RWG id.
GPII-115: Added RWG preferences sets from @kaspermarkus' pull request.
Merge branch 'master' into GPII-115

Conflicts:
	package.json
	testData/deviceReporter/win32_installedSolutions.json
	testData/solutions/win32.json
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
Merge remote-tracking branch 'javihernandez/GPII-397' into GPII-277
Merge remote-tracking branch 'javihernandez/GPII-398' into GPII-277

Conflicts:
	testData/deviceReporter/android_installedSolutions.json
	testData/deviceReporter/installedSolutions.json
	testData/solutions/android.json
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