Fix of language in views and controller.
Some merge issues.
Changed some icons for import view (and small lang. fix)
Thumbnails/pdf thumbnails.
Merge branch 'master' of https://github.com/Bonfire-Modules/file_manager.git