пояснения
пояснения
Исправлено:
- загрузка "jpeg"-файлов через виз.редактор
Merge branch 'master_oleg' into dev
Merge branch 'master' of https://github.com/dekmabot/Asterix-CMS

Conflicts:
	core_2.14/classes/nestedsets.php
Merge branch 'master' of https://github.com/dekmabot/Asterix-CMS

Conflicts:
	core_2.14/classes/nestedsets.php
jpeeeeg
Merge branch 'master_oleg' into dev

Conflicts:
	core_2.14/classes/types/field_type_file.php