BUG-5775: oxlang - check if browser language is equal shops default language, if not - do not remove language parameter from given URL
Add block to admin/order_overview.tpl

Add block to admin/order_overview.tpl to extend Order informations without overwriting the whole Template.
Add block to admin/voucherserie_main.tpl

Add bock to admin/voucherserie_main.tpl to extend the select list without overwriting the whole Template.
outsource deliverytypes to make them expendable
Fix for discount bug 5913

Fix Itm discount bug https://bugs.oxid-esales.com/view.php?id=5913
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
BUG-5775: added unit test
Revert "BUG-5775: added unit test"

This reverts commit 813b53b6918830e1529c14b8b0e6cd1a952dabc9.
BUG-5775: added unit test without code formatting the whole file
Preg quote to avoid warning

Preg quote to avoid warning with Namespaces like mentioned here https://bugs.oxid-esales.com/view.php?id=5916
added test case for Delivery_Main::getDeliveryTypes()
BUG-5775: removed debug stuff
BUG-5775: shrink line length
BUG-5775: code optimization and force default language german so it passes checks on different configured oxid installations
BUG-5775: shrink line-length to less than 120 characters to match convention
BUG-5775: fixed ISO-8859-1 charset
BUG-5775: charset ISO-8859-1 restore
Merge pull request #163 from boesing/bug-5775

0005775: DefaultLanguage collabs language selection in frontend
Adding ability to run module unit and integration tests without activating it.

Adding oxTestModuleLoader class, integrating it to current tests library.