COmposer
Composer
COmposer
Composer
Merge sonata
Merge sonata
Merge sonata
Updates
Composer
Merge sonata
Replace CKEditor
Sonata merge
Merge branch 'master' into grunt