exchange fixes and category, filter tpl come back to propel objects
Merge branch 'template' of github.com:imagecms/ImageCMS into template