Merge pull request #398 from emorency/OPAL-2188-Sort-Files

OPAL-2188: Sort files, always show folders first
OPAL-2188: Using ComparisonChain