Units sorting
fix units sorting
fix units sorting
fix units sorting and conflict
Merge pull request #120 from if045/IFJJV-153-SV-TenderViewSorting

Units sorting