Merge pull request #9 from Cloud4AllTUD/JSON-LD

Completing Rules Translation for Review
Merge pull request #10 from Cloud4AllTUD/JSON-LD

Corrected test output for integration tests
integration tests bug fixed
integration tests bugs fixed
bugs fixed - new features from Claudia's commit
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