Delete local.csv.sample
Merge branch 'master' of https://github.com/vtching/Magento-Yellowmix_ConfigOverride

Conflicts:
	app/etc/local.csv.sample
Merge branch 'master' of https://github.com/vtching/Magento-Yellowmix_ConfigOverride