redactor branch merge and Taoglas changes