fix gettext 3!
Merge branch 'origin/master'

Conflicts:
	libs/CBaseController.php