base magento files
Merge branch 'master' of github.com:mmednik/magetest