Added entity type grid
Merge branch 'master' of https://github.com/magento-hackathon/entitytype-manager

Conflicts:
	Goodahead_Etm/app/design/adminhtml/default/default/layout/goodahead_etm/goodahead_etm.xml