feature update from prod state
removed conflicts for ui_athentication and wysiwyg
Merge branch 'test' into prod