Merge branch 'dev' into dev-filter
Merge branch 'dev' into dev-filter
Merge branch 'dev-sort' into dev-filter
Removed orderList instance variable
Fixed HUGE sort bug