//version compliancy
// Added Readme.md
Merge pull request #3 from PrestaShop/dev

// Merge dev to master
Merge branch 'dev'
// update better version number
Merge branch 'dev'

Conflicts:
	config.xml
	dateofdelivery.php