[FIX] 269, 267 https://docs.google.com/spreadsheets/d/1nm8je_qayzQfJaBgiZXEm87sRhI0JgOfQzh8AiMOXxY/edit#gid=948670242 y varios
Merge branch 'develop' of https://github.com/WebThought/Innovacion into develop

Conflicts:
	language/es-ES/es-ES.com_cobalt.ini