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

Conflicts:
	config.xml
	favoriteproducts.php