test attribute merge
Changed to TypedValue
better usage of TypedValue for AttributeExtractor
CHeckStyle corrections
final adjustements
Fixed conflicts on merge

Merge branch 'master' into attribute_merge

Conflicts:
	src/main/java/ca/mcgill/cs/creco/server/RankedFeaturesProducts.java
	src/main/java/ca/mcgill/cs/creco/web/controller/SearchController.java
Merge branch 'master' into attribute_merge

Conflicts:
	src/main/java/ca/mcgill/cs/creco/logic/AttributeExtractor.java
merged with attribute_merge