viernes
Merge branch 'master' of https://github.com/VicGanuza/3Cinicos

Conflicts:
	EMC/index-de_DE.html
	EMC/index-es_MX.html
	EMC/index-fr_FR.html
	EMC/index-it_IT.html
	EMC/index-ja_JP.html
	EMC/index-ko_KR.html
	EMC/index-pt_BR.html
	EMC/index-ru_RU.html
	EMC/index-zh_CN.html
Merge branch 'master' of https://github.com/VicGanuza/3Cinicos

Conflicts:
	EMC/index-de_DE.html
	EMC/index-es_MX.html
	EMC/index-fr_FR.html
	EMC/index-it_IT.html
	EMC/index-ja_JP.html
	EMC/index-ko_KR.html
	EMC/index-pt_BR.html
	EMC/index-ru_RU.html
	EMC/index-zh_CN.html