modified:   Resources/Public/Icons/tx_ecompc_domain_model_configuration.gif
Merge branch 'master' into dev
	modified:   Tests/Unit/Domain/Model/ConfigurationTest.php
	deleted:    Tests/Unit/Domain/Model/ConfigurationOptionPackageTest.php
	deleted:    Tests/Unit/Domain/Model/ConfigurationOptionTest.php