Merging
Merge branch 'master' of https://github.com/magento-hackathon/entitytype-manager