ORM Proxy com problemas
Merge branch 'master' of https://github.com/daniel-leandro/makeup

Conflicts:
	data/DoctrineORMModule/Proxy/__CG__MarcasEntityMarcas.php
	data/DoctrineORMModule/Proxy/__CG__ProdutosEntityCategorias.php