count change
Merge remote-tracking branch 'origin/local-dev' into modfied-ui

Conflicts:
	solr/org_collection/conf/velocity/product_doc.vm
count changes
count changes
Merge pull request #9 from HappyDevs/dan-modified-ui

Dan modified ui