Merge pull request #30 from carlosrusso/master

[CLEANUP] fixed generation of marketplace entry
[CLEANUP] modified dependency on cpf from REFACTOR to TRUNK