Add rule to basic matching

This new rule removes all matched common settings from a configuration for which a
user has app-specific settings defined. Example user preferences:
* common: high contrast
* app-specific: font-size for Chrome

The core matching would also add high contrast to the inferred
configuration of Chrome. But this might be not the expected behavior of
the user. Hence, no further settings for Chrome are inferred.
Detection and Resolution of Conflicting Settings

Add a new rule for detecting and resolving the conflicts based on
conflicting settings, highContrast on windows and highContrast in Google
Chrome.

Note: This rule needs to be generalized. Information about conflicts
should be stored in JSON-LD
Add semantic infos for Android
Fix bug with multiple contexts

Rule detection works correct across multiple contexts now
Rule resolution works correct across multiple contexts now
AddPreferredSolution has been changed to work not only for conflicts
Update of all N&P sets for the Review

vladimir.json has been updated finally for Windows
vladimirSubway.json has been created for Android
Add test for VladimirSubway
Merge branch 'JSON-LD' of https://github.com/NickKaklanis/RuleBasedMatchMaker_RESTful_WS_Maven into JSON-LD

Conflicts:
	src/test/java/com/gpii/restful/RBMM_WebServiceIT.java
Merge branch 'JSON-LD' of https://github.com/NickKaklanis/RuleBasedMatchMaker_RESTful_WS_Maven into JSON-LD

Conflicts:
	src/main/webapp/WEB-INF/testData/expectedTestOutcomes/vladimirSubwayOUT.json
	src/main/webapp/WEB-INF/testData/preferences/vladimirSubway.json
	src/test/java/com/gpii/restful/RBMM_WebServiceIT.java
Merge pull request #12 from Cloud4AllTUD/JSON-LD

Merge Nicks lates commits and Fix a bug