1.9.1 upgrade
Merge branch 'master' of github.com:kizinfo/magento-example