Fixing multiple deployment listener issues
Merge remote-tracking branch 'upstream/develop' into fix_dl
Merge remote-tracking branch 'upstream/develop' into develop
Added expiration time to the SequentialDataLoader service
Making expire time atomic long on sequential data loader
Merge pull request #85 from lujameva/cache_expiration_sequential_data_loader

Cache expiration sequential data loader
Second iteration of category taxonomy code using Solr + Mongo. Added endpoint to get categories for a brand
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	opencommercesearch-common/src/main/java/org/opencommercesearch/deployment/IndexingDeploymentListener.java
Merge pull request #81 from lujameva/fix_dl

Fix various deployment listener issues
Merge pull request #75 from lujameva/develop

Merge of various pending commits
Added brand categories endpoint, multiple bug fixes and upgraded brand controller to use mongo as storage
Merge remote-tracking branch 'upstream/develop' into brand_category_api