fixes #3732 Add field that uses the ACE editor by default
Merge pull request #3841 from dotCMS/issue-3732-add-field-that-uses-the-ACE-editor-by-default

fixes #3732 Add field that uses the ACE editor by default
fixes #3827
fixes #3804 Forbidden icon when try to reorder the categories
Merge pull request #3844 from dotCMS/issue-3804-forbidden-icon-when-try-to-reorder-categories

fixes #3804 Forbidden icon when try to reorder the categories
Merge pull request #3842 from dotCMS/issue-3827-import-contentlets-using-oracle.sql.TIMESTAMP

fixes #3827
#3834
#3830
Merge pull request #3845 from dotCMS/issue-3834-Error-Logging-not-happening-properly-in-ContentResource-Save

Issue 3834 error logging not happening properly in content resource save
Merge pull request #6 from dotCMS/master

Merge pull request from dotCMS/master