Entity Grid fixes & visible attributes show
Merge branch 'master' of https://github.com/magento-hackathon/entitytype-manager

Conflicts:
	Goodahead_Etm/app/code/local/Goodahead/Etm/Model/Entity.php
Merge branch 'master' of https://github.com/magento-hackathon/entitytype-manager