GPII-216: Changed NVDA execution path to rely on registry instead of environment variable
GPII-216: Updated path to be a slightly more sensible one. Merged with latest changes to master
GPII-115: added linkage grade to standardResolver in an attempt to fix registry resolver
Merge branch 'master' into GPII-216
GPII-216: Fixed a missing quote on execution string of NVDA
GPII-305: Adding acceptance tests for Java Mobile/Symbian

* Adding fm_jme_common NP set with common terms
* Adding AcceptanceTests_jme.js with acceptance tests
GPII-305: Adding AcceptanceTests_jme.js to all-tests.js
GPII-305: Extending the description about this specific implementation
GPII-320: added acceptance tests for Chrome extension
GPII-299: Created translations for relevant settings in Mobile Accessibility for pilots 2
GPII-569: Added check if the preferences object is undefined
Merge pull request #218 from javihernandez/GPII-305

GPII-305: Adding acceptance tests for Java Mobile/Symbian
GPII-320: Merging Ignacios changes with master. Fixed a few tabs to spaces and added a copyright clause
GPII-299: Fixed error on punctuation verbosity inputPath. Simplified capitalization for direct transformation. 4 space indentation.
GPII-299: Simplified access_commonprefs_punctuation transformation.
GPII-299: Merging updated mobile accessibility entry
Merge branch 'GPII-216'

* GPII-216:
  GPII-216: Fixed a missing quote on execution string of NVDA
  GPII-115: added linkage grade to standardResolver in an attempt to fix registry resolver
  GPII-216: Changed NVDA execution path to rely on registry instead of environment variable

Conflicts:
	gpii/node_modules/lifecycleManager/src/LifecycleManager.js
	testData/solutions/win32.json
Merge remote-tracking branch 'kaspermarkus/GPII-569'

* kaspermarkus/GPII-569:
  GPII-569: Added check if the preferences object is undefined
GPII-323 Added acceptance tests preference sets for SmartHouses.
GPII-323. Add the acceptance tests for Smarthouse.