// update better version number
//Version update
Merge branch 'dev'

Conflicts:
	config.xml
	dateofdelivery.php