rename files in upload/admin/view/template/catalog/
Merge branch 'master' of github.com:neocart/neocart