Pending changes
Merge branch 'master' of git+ssh://git.yireo.com/git/software/magento/Yireo_EmailOverride

Conflicts:
	source/app/code/community/Yireo/EmailOverride/etc/config.xml
Merge branch 'master' of github.com:yireo/Yireo_EmailOverride
Version increment