// version compliancy
Merge branch 'dev'

Conflicts:
	config.xml
	favoriteproducts.php
// Added Readme.md
Merge remote-tracking branch 'origin/dev'