outsource deliverytypes to make them expendable
Merge pull request #1 from OXID-eSales/b-dev-ce

OXID updated
Merge branch 'b-dev-ce' of https://github.com/simonseggewiss/oxideshop_ce into deliverytypes
added test case for Delivery_Main::getDeliveryTypes()
Merge pull request #171 from simonseggewiss/deliverytypes

outsource deliverytypes to make them expendable
Slight tweaks to PR introduced changes

https://github.com/OXID-eSales/oxideshop_ce/pull/171
Merge remote-tracking branch 'oxid/b-dev-ce' into composer

Conflicts:
	tests/unit/admin/deliverymainTest.php
	tests/unit/core/oxlangTest.php
Merge branch 'composer' of https://github.com/robinlehrmann/oxideshop_ce into composer