tiny changes - preparing for pull/merge
MANY changes: descriptor -> productFields, Smarty for Price pages, more stuff. Good stuff.