...
Выключен кеш articles/default
Какие-то глюки
Merge branch 'master' of https://github.com/mnbnet/karavan

Conflicts:
	protected/extensions/eckeditor/assets/lang/ru.js
	protected/extensions/eckeditor/assets/plugins/a11yhelp/lang/he.js
	protected/extensions/eckeditor/assets/plugins/placeholder/lang/he.js
	protected/extensions/eckeditor/assets/plugins/styles/styles/default.js
	protected/extensions/eckeditor/assets/plugins/uicolor/lang/he.js
	protected/modules/article/controllers/DefaultController.php