module uploaded and changes in catalogcategoryview.phtml by nilesh (reverted from commit 5a051e1d590c3a30494109ddebfa3b03bbb56b46)
Merge branch 'origin/master'