js-assets shifted
fixed conflict versions
Поправил asset-path
changed require for redactor
changed require for redactor
Merged master