[FIX] Ajustes varios
Merge branch 'develop' of https://github.com/WebThought/Innovacion into develop

Conflicts:
	components/com_cobalt/views/indemandas/tmpl/default.php
[FIX] Automerge