change location of files in commerce tpl
old category template discount fixes and old filter template improvement
Merge branch 'template' of github.com:imagecms/ImageCMS into template