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.
Fix smathouse solution entry in win32
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