Initial commit
Merge branch 'master' of https://github.com/onkelsmo/magento_dev