Merge branch 'develop' of https://github.com/WebThought/MKC into develop
Merge branch 'hotfix' of https://github.com/WebThought/MKC into develop
[FEATURE] cambios plataforma tutoria
[FEATURE] abm-plataforma
[FEATURE] ABM de Plataformas
[FEATURE] ABM de Plataformas
[FEATURE] Componente com_marketcursos
[FEATURE] Modificación de archivos impactados por la creación del componente com_marketcursos
Merge branch 'hotfix' into develop
[FEATURE] Corrección de helpers en listas
Merge branch 'feature-com_marketcursos' into develop
Merge branch 'hotfix' into develop
Merge branch 'hotfix' into feature-com_marketcursos
Merge branch 'hotfix' into develop
[FEATURE] Componente MarketCursos
Merge branch 'feature-abm-plataformas' into develop
Merge branch 'feature-abm-plataformas' into feature-com_marketcursos
[FEATURE] Componente de MarketCursos
[FEATURE] Componente de MarketCursos
Merge branch 'feature-com_marketcursos' into develop

Conflicts:
	components/com_marketcursos/models/orders.php
	components/com_marketcursos/views/compras/tmpl/default.php
	components/com_marketcursos/views/compras/view.html.php
	components/com_marketcursos/views/ventas/tmpl/default.php
	components/com_marketcursos/views/ventas/tmpl/productos.php
	components/com_marketcursos/views/ventas/view.html.php