Implemented prices conversion management
Finished PSE management for products with no combinations
Merge branch 'catalog'

Conflicts:
	local/config/schema.xml