ARC
Merge branch 'master' of https://github.com/Fedos/LogNMagento

Conflicts:
	Magento/Magento.m