added Solr indexing functionality
yum more merge issues... yay.

Merge branch 'KTSSTG' of https://github.com/ktsWeb/magento into ktsWeb-KTSSTG
Merge pull request #53 from ktsweb1/STGTMP

Merge Fix