модуль инфоблоки
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/modules/channels/views/documents.blade.php