Merge branch 'feature/manage_cards' into develop
Final Version
Merge pull request #2 from beatrizanso/develop

Develop