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
OCS 0.6.0
Merge pull request #186 from naveenhooda2000/develop

freeGifts, generation number,generation master added
Return 400 (Bad Request) when a query fails due to syntax error
Changed ProductApiException to report status code from HTTP responses
Fixed broken build due to merge
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