Added interface for CRData and autowired it as a spring bean
Added interfaces and spring beans for category and product searches
Cleaned up code in search classes
Removed calls to CRData.getData()
Pulled master's changes.
Added files with resolved conflicts from master
Autowired IDataStore bean in search constructors.
Removed CRData.getData() method from tests, and autowired a test bean
instead.
#24 Merge remote-tracking branch 'origin/SpringBeans_Issue024'

Conflicts:
	src/main/java/ca/mcgill/cs/creco/server/SearchService.java