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
issue 31
issue31
Merge branch 'master' of https://github.com/prmr/Creco into Issue31
issue 31
merged with attribute_merge
remove server
merged with attribute_merge
Deprecated AttributeValue
Merge remote-tracking branch 'origin/Issue31' into attribue_merge2

Conflicts:
	src/main/java/ca/mcgill/cs/creco/data/TypedValue.java
	src/main/java/ca/mcgill/cs/creco/logic/AttributeExtractor.java
	src/main/java/ca/mcgill/cs/creco/logic/AttributeValue.java
	src/main/java/ca/mcgill/cs/creco/logic/ScoredAttribute.java
	src/main/java/ca/mcgill/cs/creco/web/controller/SearchController.java
	src/test/java/ca/mcgill/cs/creco/util/TestFiltering.java
Merge remote-tracking branch 'origin/master' into attribue_merge2

Conflicts:
	src/main/resources/templates/rankedproducts.html
	src/main/webapp/css/main.css
Null primitives arent null
Temporarily Fixed tests
Merge remote-tracking branch 'origin/master' into attribue_merge2

Conflicts:
	src/main/java/ca/mcgill/cs/creco/web/controller/SearchController.java