update sorting algorithm
fix merge conflict
fixed issue with dataSource.itemsSortList being created as NSArray instead of NSMutableArray
fixed merge conflict
fix itemsSortList property on DataSourceController