app, skin, js
Merge branch 'master' of https://github.com/dretamal/magento