Merge branch 'master' of https://github.com/prmr/Creco
temporary productsearch
temporary ProductSearch
update
Product searcher
#2 Cleaned up CRData private constructors
Merge branch 'prodsearch' into feature_extraction

Conflicts:
	src/main/java/ca/mcgill/cs/creco/data/CRDataExample.java
	src/main/java/ca/mcgill/cs/creco/web/model/search/Search.java
	src/main/java/ca/mcgill/cs/creco/web/model/search/SearchResult.java
	src/test/java/ca/mcgill/cs/creco/web/model/search/TestSearch.java
	
Updated AttributeExtractor to work with ProductSearchResult
merging stuff from lucene prod search
Merge remote-tracking branch 'origin/Integration' into feature_extraction
pulling Integration into backendControler
Merge branch 'feature_extraction' into backendController
spelling mistake in comments
add getRankeFeaturesProducts to SearchService
Failed merge

Merge remote-tracking branch 'origin/backendController' into feature_extraction
Spelling error commit