Added URL field to brand collection
Merge pull request #84 from lujameva/url_field

Added URL field to brand collection
Added expiration time to the SequentialDataLoader service
Making expire time atomic long on sequential data loader
Merge pull request #87 from lujameva/cache_expiration_sequential_data_loader_master

Cache expiration sequential data loader master
Merge branch 'develop'

Conflicts:
	opencommercesearch-atg-common/src/main/config/solr/brands/conf/schema.xml
	opencommercesearch-atg-common/src/main/java/org/opencommercesearch/service/SequentialDataLoaderService.java
fixed the json deserializer for freeGifts, also changed the status code to 404 when no generations found
Merge pull request #191 from naveenhooda2000/develop

Fixed the json deserializer for freeGifts, also changed the status code when no product generations found
Merge pull request #192 from gsegura/develop

fix issue with some poos products in the findById endpoint which didn't ...
OCS 0.7.1