GPII-321. GPII-322.  Basic solutions entry for SmartHouses. Includes preference sets for predefined personas in the simulation.
Open the url with the custom token
Add the smarthouse1.json and smarthouse2.json for testing the common terms.
Delete irrelevant preferences sets, move smarthouse solution entry to linux and win32.
GPII-455: Addded framework functions and example acceptance test for the 'cloudbased' flowmanager
Merge branch 'GPII-564' into GPII-455
GPII-455: Updated acceptanceTest framework to no longer rely on modification to kettles http request. Added textfile describing the config file used for the cloud based flowmanager config
Fix smathouse solution entry in win32
GPII-455: Updating with latest master

Merge remote-tracking branch 'upstream/master' into GPII-455
GPII-455: Added a txt file describing the acceptance test. Changed mode to 0644 as requested
GPII-455: Addressed Antranigs comments - moved the bootstrap to the correct location, corrected flowManager camelcase and added test to 'all-tests.js'
Merge branch 'GPII-455'

* GPII-455:
  GPII-455: Addressed Antranigs comments - moved the bootstrap to the correct location, corrected flowManager camelcase and added test to 'all-tests.js'
  GPII-455: Added a txt file describing the acceptance test. Changed mode to 0644 as requested
  GPII-455: Updated acceptanceTest framework to no longer rely on modification to kettles http request. Added textfile describing the config file used for the cloud based flowmanager config
  GPII-455: Addded framework functions and example acceptance test for the 'cloudbased' flowmanager
Merge branch 'master' of https://github.com/GPII/universal

Conflicts:
	testData/solutions/web.json
	testData/solutions/win32.json
Update start paths for 32bit systems.
Restore mistakenly deleted preferences for Mikel Vargas.
GPII-321: Merging in svelichkova/master - solving GPII-321