remove files that were added by mistake
Merging origin/john/master-pending-uiListSorter into master