Added in new ListView Adapters, fixed soup/salad accuracy
Merge remote-tracking branch 'origin/master'