i18n-cambios
cambio nombre controller i18n
Merge branch 'master' of https://github.com/Innoto/cogumelo

Conflicts:
	c_classes/c_controller/i18nController.php
	c_packages/base_app/c_app/Cogumelo.php
	c_vendor/gettext/gettext.inc