Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle

diff --cc lib/filelib.php
Simple merge

diff --cc lib/form/filemanager.js
Simple merge

diff --cc repository/equella/lib.php
Simple merge

diff --cc repository/filesystem/lib.php
Simple merge

diff --cc repository/lib.php
Simple merge

diff --cc theme/base/style/filemanager.css
Simple merge