Merge branch 'master' into newDesignBranch

Conflicts:
backend/views/layouts/ControllerManager/controller_editor_xhtml.phtml
backend/views/layouts/UserManager/user_editor_xhtml.phtml