Files required for Sociable Solution
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-316: Merged work from Thanos, tested and linted it
Merge pull request #183 from kaspermarkus/GPII-316

GPII-316: Sociable solution entry, preferences sets and a (seperate) installed_solutions entry containing sociable