Доработка вставки медиа файлов
Merge branch 'master' of https://github.com/livestreet/livestreet

Conflicts:
	application/frontend/common/js/media.js
	application/frontend/skin/developer/modals/modal.upload_image.gallery.tpl