// version compliancy
// Changelog updated
// Changelog updated
/Version update
Merge branch 'dev'

Conflicts:
	carriercompare.php
	config.xml