Corrected compatibility issues
Merge branch 'master' of https://github.com/Bonfire-Modules/file_manager.git
Some fixes to settings view and controller