Merge branch 'devel'
Merge branch 'fileManager'