Merge branch 'develop_fixLibraryBrowser3' of https://github.com/mgage/webwork2 into devupdates
Merge branch 'develop' of http://github.com/openwebwork/webwork2 into devupdates
Merge branch 'develop' of http://github.com/openwebwork/webwork2 into devupdates
Fixed issue with FileManager (Bug 2686)
Merge pull request #138 from goehle/devupdates

Bugfix