Change layout of fileManager: File types
Change layout of fileManager: Time limit
Bug fixing
Merge remote-tracking branch 'origin/release-candidate' into develop