// Version compliancy
// Changelog updated
// Changelog updated
// Added Readme.md
//version update
Merge branch 'dev'

Conflicts:
	config.xml
	crossselling.php