Add language entries
Change setup version to 0.8.6
resolve bug with biggeer pickup wwindow than delivery window
Change title in 3rd option delivery
Merge branch 'trello.iss.21.3rd.option.delivery' into 4.3.2

Conflicts:
	copy_this/modules/oxtiramizoo/core/oxtiramizoo_helper.php
	copy_this/modules/oxtiramizoo/core/oxtiramizoo_setup.php
	copy_this/views/oxtiramizoo_payment.php
Change labels in settings
Merge branch 'trello.iss.21.3rd.option.delivery' into 4.3.2
Merge branch '4.3.2' into staging

Conflicts:
	copy_this/modules/oxtiramizoo/core/oxtiramizoo_helper.php
	copy_this/modules/oxtiramizoo/core/oxtiramizoo_setup.php
	copy_this/out/admin/de/oxtiramizoo_de_lang.php
	copy_this/out/admin/en/oxtiramizoo_en_lang.php