commit required because of merge.
Merge branch 'master' of https://github.com/proxi24be/proxi24be

Conflicts:
	protected/modules/i18n/controllers/TranslationController.php
	protected/modules/i18n/javascript/translation/Translation.js
	protected/modules/i18n/javascript/translation/controller/DefaultController.js
	protected/modules/i18n/views/translation/application.php
commit for working on laptop.